summaryrefslogtreecommitdiff
path: root/time
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 /time
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 'time')
-rw-r--r--time/korganizer/Makefile7
-rw-r--r--time/kworldwatch/Makefile7
-rw-r--r--time/xtu/Makefile4
3 files changed, 12 insertions, 6 deletions
diff --git a/time/korganizer/Makefile b/time/korganizer/Makefile
index 9de623f8a99..4c92b4d6908 100644
--- a/time/korganizer/Makefile
+++ b/time/korganizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/03/12 21:02:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/14 19:37:57 jlam Exp $
DISTNAME= korganizer-1.1.2
PKGREVISION= 1
@@ -24,6 +24,9 @@ CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \
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/time/kworldwatch/Makefile b/time/kworldwatch/Makefile
index 62fea244171..00494aa40df 100644
--- a/time/kworldwatch/Makefile
+++ b/time/kworldwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/21 15:29:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/14 19:37:58 jlam Exp $
#
DISTNAME= kworldwatch-0.6
@@ -24,7 +24,10 @@ CONFIGURE_ARGS+=--datadir=${BUILDLINK_PREFIX.kdebase}/share/kde \
--enable-path-check
CONFIGURE_ENV= KDEDIR=${BUILDLINK_PREFIX.kdebase} \
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 "../../devel/gettext-lib/buildlink2.mk"
.include "../../x11/kdebase/buildlink2.mk"
diff --git a/time/xtu/Makefile b/time/xtu/Makefile
index 547718b7943..032d1f6bedc 100644
--- a/time/xtu/Makefile
+++ b/time/xtu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/27 21:24:58 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/14 19:37:58 jlam Exp $
#
DISTNAME= xtu-1.1
@@ -12,7 +12,7 @@ COMMENT= Small configurable X11 analog clock
USE_X11= yes
do-build:
- cd ${WRKSRC} && ${CC} *.c -o xtu -I${X11BASE}/include -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
+ cd ${WRKSRC} && ${CC} *.c -o xtu -I${X11BASE}/include ${X11_LDFLAGS} -lX11 -lXext
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xtu ${PREFIX}/bin/