cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using supplied bootstrap.sh (plus a patch to stop it

Browse Source 
from overriding supplied AUTOfoo_VERSION variables) instead of the
custom Makefile target to run autoconf.

No package change -> no bump. Discussed with fgsch in relation
to 1.6, but it makes sense here too.
This commit is contained in:
sthen 2009-11-04 21:51:49 +00:00
parent 95fdcebf42
commit e6279a7a86
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/asterisk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2009/11/04 21:49:42 sthen Exp $
# $OpenBSD: Makefile,v 1.62 2009/11/04 21:51:49 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
@ -214,15 +214,10 @@ INSTALL_TARGET= install samples
EXAMPLEDIR= ${PREFIX}/share/examples/asterisk
post-patch:
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} aclocal -I autoconf
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} autoheader
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} automake \
--add-missing --copy || true
cd ${WRKSRC}; \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
./bootstrap.sh
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asterisk

14
telephony/asterisk/patches/patch-bootstrap_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-bootstrap_sh,v 1.1 2009/11/04 21:51:49 sthen Exp $
--- bootstrap.sh.orig Thu Oct 30 20:58:24 2008
+++ bootstrap.sh Wed Nov 4 21:25:03 2009
@@ -19,8 +19,8 @@ if [ $? = 0 ] ; then # FreeBSD case
else # linux case
MY_AC_VER=
MY_AM_VER=
- AUTOCONF_VERSION=2.60
- AUTOMAKE_VERSION=1.9
+ [ -z "$AUTOCONF_VERSION" ] && AUTOCONF_VERSION=2.60
+ [ -z "$AUTOMAKE_VERSION" ] && AUTOMAKE_VERSION=1.9
export AUTOCONF_VERSION
export AUTOMAKE_VERSION
fi