summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorjlam <jlam>2003-03-14 19:37:30 +0000
committerjlam <jlam>2003-03-14 19:37:30 +0000
commita771eb7968c94f0addf4db20c476555536382e51 (patch)
tree4ee2e06249d68477cf3fb68be1f095453bcec90d /games
parentf11a46ae0626751873aec65de2e0341f70f610e7 (diff)
downloadpkgsrc-a771eb7968c94f0addf4db20c476555536382e51.tar.gz
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for worse. (2) Create a new variable FIX_RPATH that lists variables that should be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and additional variables may be appended from package Makefiles.
Diffstat (limited to 'games')
-rw-r--r--games/abuse/Makefile4
-rw-r--r--games/backgammon/Makefile7
-rw-r--r--games/kdegames/Makefile7
-rw-r--r--games/kdetoys/Makefile7
-rw-r--r--games/netmaze/Makefile4
5 files changed, 19 insertions, 10 deletions
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 967e2a35c03..2a9d96a8d27 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/14 19:37:37 jlam Exp $
DISTNAME= abuse_pd
PKGNAME= abuse-2.0
@@ -13,7 +13,7 @@ COMMENT= Full color 320x200 arcade quality platform shooter
USE_X11BASE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="-Wl,-R${X11BASE}/lib"
+CONFIGURE_ENV+= LDFLAGS="${X11_LDFLAGS}"
USE_GMAKE= yes
NOT_FOR_PLATFORM= NetBSD-*-arm32
diff --git a/games/backgammon/Makefile b/games/backgammon/Makefile
index 12489368e88..0b7cbd877f6 100644
--- a/games/backgammon/Makefile
+++ b/games/backgammon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/11/04 23:27:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/14 19:37:38 jlam Exp $
#
DISTNAME= bacKgammon-1.9.1b
@@ -24,6 +24,9 @@ CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \
MOC=${QT1DIR}/qt1/bin/moc \
QTDIR=${QT1DIR}/qt1 \
CXXFLAGS="${CFLAGS}" \
- all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
+ all_libraries="${KDE_LDFLAGS}"
+
+FIX_RPATH+= KDE_LDFLAGS
+KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
.include "../../mk/bsd.pkg.mk"
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index fe806d6852f..d142a599b63 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/03/13 12:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2003/03/14 19:37:38 jlam Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
#
@@ -25,6 +25,9 @@ CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \
CXXFLAGS="${CFLAGS}" \
- all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
+ all_libraries="${KDE_LDFLAGS}"
+
+FIX_RPATH+= KDE_LDFLAGS
+KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
.include "../../mk/bsd.pkg.mk"
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile
index 43f9f898823..0ed633c40b7 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/12 21:02:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/14 19:37:39 jlam Exp $
DISTNAME= kdetoys-1.1.2
PKGREVISION= 1
@@ -25,6 +25,9 @@ CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \
QTDIR=${QT1DIR}/qt1 \
CXXFLAGS="${CFLAGS}" \
- all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+ all_libraries="${KDE_LDFLAGS}"
+
+FIX_RPATH+= KDE_LDFLAGS
+KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
.include "../../mk/bsd.pkg.mk"
diff --git a/games/netmaze/Makefile b/games/netmaze/Makefile
index 8029cd6b80c..0746ca6f767 100644
--- a/games/netmaze/Makefile
+++ b/games/netmaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/02/26 04:07:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/14 19:37:39 jlam Exp $
DISTNAME= netmaze0.81
PKGNAME= netmaze-0.81
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/netmaze
post-patch:
${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak
- ${SED} -e 's|@X11LIBS@|-Wl,-R${X11BASE}/lib|g' \
+ ${SED} -e 's|@X11LIBS@|${X11_LDFLAGS}|g' \
< ${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile
.include "../../mk/bsd.pkg.mk"