On Thu, 26 Jul 2007 00:23:55 +0100 Stuart Henderson <[EMAIL PROTECTED]> wrote:
> http://spacehopper.org/openbsd/asterisk.tar.gz is updated for > 1.4.9 (DoS fix and a bunch more bugs; 1.2 is now mostly on life- > support, very few fixes there now). > > I added some subpackages and associated no_xxx PSEUDO_FLAVORS > to disable them (imap and h323 are not working yet), if you don't > want to pull in the dependencies, build with: > > FLAVOR="no_h323 no_imap no_snmp no_odbc no_speex no_curl no_pgsql" > > Anyone that knows how to make app_conference work (I couldn't) > and cares about 1.4 not breaking it, please be a guinea pig for > 1.4 with http://spacehopper.org/openbsd/app_conference.diff (-: Unfortunately after you made the sub-package changes the resulting package is unusable due to a mistake with the registered dependencies. Here is a diff for a few of the nits I had noticed and a fix for the sub-package dependencies. --- Makefile.orig Wed Jul 25 19:26:54 2007 +++ Makefile Thu Jul 26 03:01:32 2007 @@ -7,7 +7,6 @@ V= 1.4.9 DISTNAME= asterisk-${V} FULLPKGNAME-main= ${DISTNAME} - CATEGORIES= telephony HOMEPAGE= http://www.asterisk.org/ @@ -33,8 +32,8 @@ USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" \ - LDFLAGS="${LDFLAGS} -L${PREFIX}/local" +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/local" CONFIGURE_ARGS+= --with-asterisk-user=_asterisk \ --with-asterisk-group=_asterisk \ @@ -46,7 +45,7 @@ CONFIGURE_ARGS+= --with-asterisk-user=_asterisk \ --with-isdnnet=no \ --with-misdn=no \ --with-pri=no \ - --with-popt=/usr/local \ + --with-popt=${LOCALBASE} \ --with-zaptel=no CONFIGURE_ARGS+= --with-gnutls=no \ @@ -83,8 +82,8 @@ CONFIGURE_ARGS+= --with-odbc=no \ MULTI_PACKAGES+= -odbc COMMENT-odbc= ODBC support for Asterisk LIB_DEPENDS-odbc= iodbc.>=3::databases/iodbc -CONFIGURE_ARGS+= --with-odbc=/usr/local \ - --with-ltdl=/usr/local +CONFIGURE_ARGS+= --with-odbc=${LOCALBASE} \ + --with-ltdl=${LOCALBASE} .endif # snmp @@ -99,7 +98,7 @@ LIB_DEPENDS-snmp= netsnmp.>=7::net/net-snmp \ netsnmpagent.>=7::net/net-snmp \ netsnmphelpers.>=7::net/net-snmp \ netsnmpmibs.>=7::net/net-snmp -CONFIGURE_ARGS+= --with-netsnmp=/usr/local +CONFIGURE_ARGS+= --with-netsnmp=${LOCALBASE} .endif # speex @@ -111,7 +110,7 @@ MULTI_PACKAGES+= -speex COMMENT-speex= Speex code for Asterisk WANTLIB-speex= m LIB_DEPENDS-speex= speex.>=6::audio/speex -CONFIGURE_ARGS+= --with-speex=/usr/local +CONFIGURE_ARGS+= --with-speex=${LOCALBASE} .endif # curl @@ -123,7 +122,7 @@ MULTI_PACKAGES+= -curl COMMENT-curl= libCURL support for Asterisk WANTLIB-curl= crypto idn ssl z LIB_DEPENDS-curl= curl.>=2::net/curl -CONFIGURE_ARGS+= --with-curl=/usr/local +CONFIGURE_ARGS+= --with-curl=${LOCALBASE} .endif # postgresql @@ -135,7 +134,7 @@ MULTI_PACKAGES+= -pgsql COMMENT-pgsql= PostgreSQL support for Asterisk WANTLIB-pgsql= z LIB_DEPENDS-pgsql= pq.>=5::databases/postgresql -CONFIGURE_ARGS+= --with-postgres=/usr/local +CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} .endif # imap voicemail-storage @@ -147,7 +146,7 @@ MULTI_PACKAGES+= -imap COMMENT-imap= IMAP voicemail storage for Asterisk WANTLIB-imap= BUILD_DEPENDS+= ::mail/c-client -CONFIGURE_ARGS+= --with-imap=/usr/local/include +CONFIGURE_ARGS+= --with-imap=${LOCALBASE}/include .endif # chan_h323 @@ -161,15 +160,14 @@ COMMENT-h323= H.323 channel driver for Asterisk WANTLIB-h323= BUILD_DEPENDS+= ::net/openh323 \ ::devel/pwlib -CONFIGURE_ARGS+= --with-pwlib=/usr/local/include/ptlib \ - --with-h323=/usr/local/include/openh323 -CPPFLAGS+= -I${PREFIX}/include/openh323 +CONFIGURE_ARGS+= --with-pwlib=${LOCALBASE}/include/ptlib \ + --with-h323=${LOCALBASE}/include/openh323 +CPPFLAGS+= -I${LOCALBASE}/include/openh323 .endif -# --with-pwlib=/usr/local/include/ptlib \ -.for i in ${MULTI_PACKAGES} -FULLPKGNAME${i} ?= asterisk${i}-${V} -RUN_DEPENDS${i}= :asterisk-${V}:telephony/asterisk +.for i in ${MULTI_PACKAGES:S/-main//} +FULLPKGNAME${i}= asterisk${i}-${V} +RUN_DEPENDS${i}= :asterisk-${V}:telephony/asterisk .endfor MAKE_ENV= ASTCFLAGS="${CFLAGS}" \
