summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2007-10-22 11:56:46 +0000
committerdsainty <dsainty@pkgsrc.org>2007-10-22 11:56:46 +0000
commit77c395ab30b7ca3d2f4fa0221608eed93e9511aa (patch)
tree664d505664c4674ab757036e731fbd34267a636c /print
parent9949b8ea43e4476c7849cca02d41dd7d1cca82b9 (diff)
downloadpkgsrc-77c395ab30b7ca3d2f4fa0221608eed93e9511aa.tar.gz
Fix the output of "cups-config --ldflags" to output "-Wl,-R/usr/pkg" like
other config scripts do. Bump PKGREVISION since client software may not correctly build or run without this fix.
Diffstat (limited to 'print')
-rw-r--r--print/cups/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index d5020e77742..67fa0d42814 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2007/10/08 11:39:47 rillig Exp $
+# $NetBSD: Makefile,v 1.127 2007/10/22 11:56:46 dsainty Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -9,6 +9,7 @@ PKGNAME= cups-${VERS}
BASE_VERS= 1.2.12
DIST_VERS= ${BASE_VERS}
VERS= ${DIST_VERS:S/-/./g}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -136,6 +137,12 @@ SUBST_FILES.paths= ${WRKDIR}/cups.pam
SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g'
SUBST_STAGE.paths= post-patch
+SUBST_CLASSES+= rpathfix
+SUBST_FILES.rpathfix= cups-config.in
+SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
+SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${LOCALBASE}/lib|g'
+SUBST_STAGE.rpathfix= post-patch
+
pre-configure:
cd ${WRKSRC} && aclocal && autoconf