Sat Mar 10 20:36:58 2012 UTC ()
s/LINKER_RPATH_FLAG/COMPILER_RPATH_FLAG/ as this is passed to gcc.


(markd)
diff -r1.17 -r1.18 pkgsrc/devel/opal/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/devel/opal/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/opal/Attic/Makefile 2011/12/06 01:21:35 1.17
+++ pkgsrc/devel/opal/Attic/Makefile 2012/03/10 20:36:57 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2011/12/06 01:21:35 marino Exp $ 1# $NetBSD: Makefile,v 1.18 2012/03/10 20:36:57 markd Exp $
2# 2#
3 3
4DISTNAME= opal-3.6.6 4DISTNAME= opal-3.6.6
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= devel net comms 6CATEGORIES= devel net comms
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/opal/3.6/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/opal/3.6/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.opalvoip.org/ 11HOMEPAGE= http://www.opalvoip.org/
12COMMENT= Open Phone Abstraction Library 12COMMENT= Open Phone Abstraction Library
13LICENSE= mpl-1.0 13LICENSE= mpl-1.0
14 14
@@ -38,27 +38,27 @@ PLIST_SUBST+= OPALLIBDIR=${OPALLIBDIR:Q @@ -38,27 +38,27 @@ PLIST_SUBST+= OPALLIBDIR=${OPALLIBDIR:Q
38 38
39.if "${MACHINE_ARCH}" == "i386" 39.if "${MACHINE_ARCH}" == "i386"
40PLIST_SUBST+= LIBARCH=x86 40PLIST_SUBST+= LIBARCH=x86
41.else 41.else
42PLIST_SUBST+= LIBARCH=${MACHINE_ARCH:Q} 42PLIST_SUBST+= LIBARCH=${MACHINE_ARCH:Q}
43.endif 43.endif
44 44
45post-install: 45post-install:
46 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/opal 46 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/opal
47 ${INSTALL_DATA} ${WRKSRC}/opal_inc.mak ${DESTDIR}${PREFIX}/share/opal 47 ${INSTALL_DATA} ${WRKSRC}/opal_inc.mak ${DESTDIR}${PREFIX}/share/opal
48 ${INSTALL_DATA} ${WRKSRC}/version.h ${DESTDIR}${PREFIX}/share/opal 48 ${INSTALL_DATA} ${WRKSRC}/version.h ${DESTDIR}${PREFIX}/share/opal
49 49
50# pkgsrc's gsm is shlib, need additional linker flags. 50# pkgsrc's gsm is shlib, need additional linker flags.
51GSM_LIBS= ${LINKER_RPATH_FLAG}${BUILDLINK_PREFIX.gsm}/lib 51GSM_LIBS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gsm}/lib
52GSM_LIBS+= -L${BUILDLINK_PREFIX.gsm}/lib -lgsm 52GSM_LIBS+= -L${BUILDLINK_PREFIX.gsm}/lib -lgsm
53SUBST_CLASSES+= gsm 53SUBST_CLASSES+= gsm
54SUBST_STAGE.gsm= pre-configure 54SUBST_STAGE.gsm= pre-configure
55SUBST_FILES.gsm= plugins/configure 55SUBST_FILES.gsm= plugins/configure
56SUBST_SED.gsm= -e 's;GSM_LIBS="-lgsm";GSM_LIBS="${GSM_LIBS}";g' 56SUBST_SED.gsm= -e 's;GSM_LIBS="-lgsm";GSM_LIBS="${GSM_LIBS}";g'
57 57
58#for WAV49 58#for WAV49
59BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.12 59BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.12
60.include "../../audio/gsm/buildlink3.mk" 60.include "../../audio/gsm/buildlink3.mk"
61.include "../../audio/speex/buildlink3.mk" 61.include "../../audio/speex/buildlink3.mk"
62.include "../../devel/ptlib/buildlink3.mk" 62.include "../../devel/ptlib/buildlink3.mk"
63.include "../../multimedia/ffmpeg/buildlink3.mk" 63.include "../../multimedia/ffmpeg/buildlink3.mk"
64.include "../../multimedia/x264-devel/buildlink3.mk" 64.include "../../multimedia/x264-devel/buildlink3.mk"