summaryrefslogtreecommitdiff
path: root/print/cups/Makefile
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-05-17 10:40:45 +0000
committerjlam <jlam@pkgsrc.org>2004-05-17 10:40:45 +0000
commitaa3ba79ac6e82188c38ee773394a9d8c4217d3f0 (patch)
tree893da3d12e8562a4de2d690391e7a951482f2737 /print/cups/Makefile
parent9dc812c039aa3bb0969588d6c2b88dec46a9e517 (diff)
downloadpkgsrc-aa3ba79ac6e82188c38ee773394a9d8c4217d3f0.tar.gz
Correct the flags passed to the linker when building with libtool and bump
the PKGREVISION. Also remove the unnecessary -preserve-dup-deps argument to libtool, rename the configure option to --enable-libtool, and remove the unnecessary bits to deal with libcrypt/libcrypto (buildlink3 does this for us automatically).
Diffstat (limited to 'print/cups/Makefile')
-rw-r--r--print/cups/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 86dde55ac71..fa091fe2799 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2004/03/26 02:27:50 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2004/05/17 10:40:45 jlam 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:
@@ -10,7 +10,7 @@ PKGREVISION= # empty
BASE_VERS= 1.1.20
DIST_VERS= ${BASE_VERS}
VERS= ${DIST_VERS:S/-/./g}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -35,10 +35,8 @@ USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
-INSTALL_TARGET= installcups
-
USE_LIBTOOL= yes
-LIBTOOL_FLAGS+= --preserve-dup-deps
+INSTALL_TARGET= installcups
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
@@ -49,7 +47,7 @@ CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR}
CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
CONFIGURE_ARGS+= --with-manext=bsd
-CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL} ${LIBTOOL_FLAGS}"
+CONFIGURE_ARGS+= --enable-libtool
CONFIGURE_ARGS+= --enable-slp
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}"