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

Use SUBST_CMD now that nigel@ fixed Subst.pm.

Browse Source
This commit is contained in:
ajacoutot 2011-11-13 15:53:14 +00:00
parent 420d8315f9
commit c84f9fc9ab
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/opal/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2011/10/26 16:59:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2011/11/13 15:53:14 ajacoutot Exp $
SHARED_ONLY= Yes
@ -66,9 +66,8 @@ CONFIGURE_ARGS= --disable-localspeex \
CONFIGURE_ARGS+= --disable-vpb
pre-configure:
# use perl(1) instead of SUBST_CMD to prevent breaking the configure script
perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
-e 's,SUBDIRS\+=\",SUBDIRS=\"\$${SUBDIRS},g' \
${SUBST_CMD} ${WRKSRC}/plugins/configure
perl -pi -e 's,SUBDIRS\+=\",SUBDIRS=\"\$${SUBDIRS},g' \
${WRKSRC}/plugins/configure
post-install:

6
net/opal/patches/patch-plugins_configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-plugins_configure,v 1.5 2011/10/26 16:59:34 ajacoutot Exp $
$OpenBSD: patch-plugins_configure,v 1.6 2011/11/13 15:53:14 ajacoutot Exp $
--- plugins/configure.orig Fri Oct 14 09:00:00 2011
+++ plugins/configure Mon Oct 24 18:35:23 2011
@@ -6479,7 +6479,7 @@ $as_echo "#define PLUGIN_CODEC_DLL_EXPORTS 1" >>confde
@ -24,7 +24,7 @@ $OpenBSD: patch-plugins_configure,v 1.5 2011/10/26 16:59:34 ajacoutot Exp $
if test "x${opal_gsm}" = "xyes" ; then
- GSM_CFLAGS="-I/usr/include/gsm -I/usr/local/include/gsm"
+ GSM_CFLAGS="-I!!LOCALBASE!!/include"
+ GSM_CFLAGS="-I${LOCALBASE}/include"
GSM_LIBS="-lgsm"
fi
@ -42,7 +42,7 @@ $OpenBSD: patch-plugins_configure,v 1.5 2011/10/26 16:59:34 ajacoutot Exp $
if test "x${opal_gsm}" = "xyes" ; then
- GSM_CFLAGS="-I/usr/include/gsm -I/usr/local/include/gsm"
+ GSM_CFLAGS="-I!!LOCALBASE!!/include"
+ GSM_CFLAGS="-I${LOCALBASE}/include"
GSM_LIBS="-lgsm"
fi