sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fix pkg-plist [1]

Browse source 
- enable dahdi on sparc64 [2]
- only use /var as localstatedir if we install to LOCALBASE
- fix harmless portlint warning

PR:		153507 [1]
Submitted by:	Dan Lukes <dan@obluda.cz> [1]
		fjoe [2]

Approved by:	fjoe (mentor)
This commit is contained in:
Florian Smeets 2010-12-29 12:47:09 +00:00
parent 2a0336a795
commit 4ae80f99d4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=267124
6 changed files with 58 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/asterisk/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.8.1.1
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@ -25,7 +26,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --localstatedir=/var
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE= yes
USE_GNOME= libxml2
@ -67,11 +68,17 @@ GROUPS= ${ASTERISK_GROUP} dahdi
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386" || ${ARCH} == "amd64"
.if ${PREFIX} == ${LOCALBASE}
VARDIR=/var
.else
VARDIR=${PREFIX}/var
.endif
.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
OPTIONS+= DAHDI "Enable DAHDI support" on
.if defined(WITH_IODBC) && defined(WITH_UODBC)
IGNORE= please select only one of iodbc or unixODBC
IGNORE= please select only one of iodbc or unixODBC
.endif
# Include this since we have altered OPTIONS.
@ -81,6 +88,7 @@ IGNORE= please select only one of iodbc or unixODBC
SUB_LIST+= ASTERISK_USER=${ASTERISK_USER}
PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER}
PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP}
PLIST_SUB+= VARDIR=${VARDIR}
.if !defined(WITH_H323)
PLIST_SUB+= WITH_H323="@comment "
@ -255,6 +263,6 @@ post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
post-install:
@${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} /var/db/asterisk /var/log/asterisk /var/spool/asterisk
@${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk
.include <bsd.port.post.mk>

18
net/asterisk/files/patch-configure
View file

@ -1,6 +1,14 @@
--- configure.orig 2010-10-07 22:58:47.000000000 +0200
+++ configure 2010-11-06 15:54:49.000000000 +0100
@@ -4670,9 +4670,9 @@
--- configure.orig 2010-11-09 21:33:05.000000000 +0100
+++ configure 2010-12-29 09:00:30.000000000 +0100
@@ -600,7 +600,6 @@
ac_default_prefix=/usr/local
ac_default_prefix=/usr/local
ac_default_prefix=/usr/local
-ac_default_prefix=/usr
ac_header_list=
ac_subst_vars='LTLIBOBJS
PBX_SYSLOG
@@ -4670,9 +4669,9 @@
astheaderdir='${includedir}/asterisk'
astlibdir='${libdir}/asterisk'
astmandir='${mandir}'
@ -12,7 +20,7 @@
astkeydir='${astvarlibdir}'
astspooldir='${localstatedir}/spool/asterisk'
astlogdir='${localstatedir}/log/asterisk'
@@ -4694,9 +4694,6 @@
@@ -4694,9 +4693,6 @@
case "${host_os}" in
freebsd*)
@ -22,7 +30,7 @@
;;
openbsd*)
@@ -25058,7 +25055,7 @@
@@ -25152,7 +25148,7 @@
fi

8
net/asterisk/pkg-plist
View file

@ -541,9 +541,9 @@ lib/asterisk/modules/cdr_syslog.so
lib/asterisk/modules/cel_custom.so
lib/asterisk/modules/cel_manager.so
%%WITH_ODBC%%lib/asterisk/modules/cel_odbc.so
lib/asterisk/modules/cel_pgsql.so
lib/asterisk/modules/cel_radius.so
lib/asterisk/modules/cel_sqlite3_custom.so
%%WITH_POSTGRES%%lib/asterisk/modules/cel_pgsql.so
%%WITH_RADIUS%%lib/asterisk/modules/cel_radius.so
%%WITH_SQLITE%%lib/asterisk/modules/cel_sqlite3_custom.so
%%WITH_FREETDS%%lib/asterisk/modules/cel_tds.so
lib/asterisk/modules/chan_agent.so
%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so
@ -1167,7 +1167,7 @@ share/asterisk/static-http/mantest.html
@exec mkdir -p %D/share/asterisk/sounds/es
@exec mkdir -p %D/share/asterisk/sounds/fr
@exec mkdir -p %D/share/asterisk/sounds/en_AU
@cwd /var
@cwd %%VARDIR%%
spool/asterisk/voicemail/default/1234/en/busy.gsm
spool/asterisk/voicemail/default/1234/en/unavail.gsm
@exec mkdir -p %D/log/asterisk/cdr-csv

16
net/asterisk10/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.8.1.1
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@ -25,7 +26,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --localstatedir=/var
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE= yes
USE_GNOME= libxml2
@ -67,11 +68,17 @@ GROUPS= ${ASTERISK_GROUP} dahdi
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386" || ${ARCH} == "amd64"
.if ${PREFIX} == ${LOCALBASE}
VARDIR=/var
.else
VARDIR=${PREFIX}/var
.endif
.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
OPTIONS+= DAHDI "Enable DAHDI support" on
.if defined(WITH_IODBC) && defined(WITH_UODBC)
IGNORE= please select only one of iodbc or unixODBC
IGNORE= please select only one of iodbc or unixODBC
.endif
# Include this since we have altered OPTIONS.
@ -81,6 +88,7 @@ IGNORE= please select only one of iodbc or unixODBC
SUB_LIST+= ASTERISK_USER=${ASTERISK_USER}
PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER}
PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP}
PLIST_SUB+= VARDIR=${VARDIR}
.if !defined(WITH_H323)
PLIST_SUB+= WITH_H323="@comment "
@ -255,6 +263,6 @@ post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
post-install:
@${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} /var/db/asterisk /var/log/asterisk /var/spool/asterisk
@${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk
.include <bsd.port.post.mk>

18
net/asterisk10/files/patch-configure
View file

@ -1,6 +1,14 @@
--- configure.orig 2010-10-07 22:58:47.000000000 +0200
+++ configure 2010-11-06 15:54:49.000000000 +0100
@@ -4670,9 +4670,9 @@
--- configure.orig 2010-11-09 21:33:05.000000000 +0100
+++ configure 2010-12-29 09:00:30.000000000 +0100
@@ -600,7 +600,6 @@
ac_default_prefix=/usr/local
ac_default_prefix=/usr/local
ac_default_prefix=/usr/local
-ac_default_prefix=/usr
ac_header_list=
ac_subst_vars='LTLIBOBJS
PBX_SYSLOG
@@ -4670,9 +4669,9 @@
astheaderdir='${includedir}/asterisk'
astlibdir='${libdir}/asterisk'
astmandir='${mandir}'
@ -12,7 +20,7 @@
astkeydir='${astvarlibdir}'
astspooldir='${localstatedir}/spool/asterisk'
astlogdir='${localstatedir}/log/asterisk'
@@ -4694,9 +4694,6 @@
@@ -4694,9 +4693,6 @@
case "${host_os}" in
freebsd*)
@ -22,7 +30,7 @@
;;
openbsd*)
@@ -25058,7 +25055,7 @@
@@ -25152,7 +25148,7 @@
fi

8
net/asterisk10/pkg-plist
View file

@ -541,9 +541,9 @@ lib/asterisk/modules/cdr_syslog.so
lib/asterisk/modules/cel_custom.so
lib/asterisk/modules/cel_manager.so
%%WITH_ODBC%%lib/asterisk/modules/cel_odbc.so
lib/asterisk/modules/cel_pgsql.so
lib/asterisk/modules/cel_radius.so
lib/asterisk/modules/cel_sqlite3_custom.so
%%WITH_POSTGRES%%lib/asterisk/modules/cel_pgsql.so
%%WITH_RADIUS%%lib/asterisk/modules/cel_radius.so
%%WITH_SQLITE%%lib/asterisk/modules/cel_sqlite3_custom.so
%%WITH_FREETDS%%lib/asterisk/modules/cel_tds.so
lib/asterisk/modules/chan_agent.so
%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so
@ -1167,7 +1167,7 @@ share/asterisk/static-http/mantest.html
@exec mkdir -p %D/share/asterisk/sounds/es
@exec mkdir -p %D/share/asterisk/sounds/fr
@exec mkdir -p %D/share/asterisk/sounds/en_AU
@cwd /var
@cwd %%VARDIR%%
spool/asterisk/voicemail/default/1234/en/busy.gsm
spool/asterisk/voicemail/default/1234/en/unavail.gsm
@exec mkdir -p %D/log/asterisk/cdr-csv