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).

9 files changed, 100 insertions, 147 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}"
diff --git a/print/cups/distinfo b/print/cups/distinfo
index c5ff5a57c3d..63db9d671b2 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.24 2004/01/10 03:32:09 jlam Exp $
+$NetBSD: distinfo,v 1.25 2004/05/17 10:40:45 jlam Exp $
 
 SHA1 (cups-1.1.20-source.tar.bz2) = aa0fd35fb4b17ad3311801284295e2693a6e220b
 Size (cups-1.1.20-source.tar.bz2) = 3741510 bytes
-SHA1 (patch-aa) = 931a6f35ec0d4f41240031abb98be3e7e4b6de38
 SHA1 (patch-ab) = 29c205c31a70229f46f0c99775e70fc9c56af1e8
-SHA1 (patch-ad) = a426a03e67800a66fc819e79762e64fd2a73c646
-SHA1 (patch-af) = b6f8a67e1c837ef2e674af886d80e5d16643b500
+SHA1 (patch-ac) = 45388ca8b1bfeaf5d3649b766f65ac7f3108af74
+SHA1 (patch-ad) = 166749eb9fc7b4b20e123d81cd3b2cf96db27677
+SHA1 (patch-af) = f60f9f9087d9802bbcb2870ca35030b9ddfd60a7
 SHA1 (patch-ag) = bb33db57dd0cfec78fd6110436d91c26615f5bf6
-SHA1 (patch-am) = 67446886161f3062b89f3d9da56edc7faca4ad18
 SHA1 (patch-an) = c4266134f66868f59978ca513f8e3f68dc10f07f
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
-SHA1 (patch-ap) = b117e9fedee45bea544c0ec1ea1b8b4e60483aa9
-SHA1 (patch-at) = 331bfe986dbb1e7f894ec6f0a6baaa86b36307a5
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
deleted file mode 100644
index 4e24baec406..00000000000
--- a/print/cups/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.16 2003/05/28 02:34:00 jlam Exp $
-
---- Makedefs.in.orig	Thu Apr 17 10:20:47 2003
-+++ Makedefs.in
-@@ -65,6 +65,7 @@ CUPS_GROUP	=	@CUPS_GROUP@
- # Libraries...
- #
- 
-+LIBCRYPT	=	@LIBCRYPT@
- LIBCUPS		=	@LIBCUPS@
- LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
- LIBJPEG		=	@LIBJPEG@
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
new file mode 100644
index 00000000000..ad8b2ae5331
--- /dev/null
+++ b/print/cups/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.12 2004/05/17 10:40:45 jlam Exp $
+
+--- configure.in.orig	Fri Mar 14 12:04:08 2003
++++ configure.in
+@@ -30,7 +30,6 @@ sinclude(config-scripts/cups-directories
+ sinclude(config-scripts/cups-manpages.m4)
+ 
+ sinclude(config-scripts/cups-sharedlibs.m4)
+-sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+ 
+ sinclude(config-scripts/cups-image.m4)
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index 2a60d94e490..c575c18c4e6 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,22 +1,82 @@
-$NetBSD: patch-ad,v 1.11 2003/05/28 02:34:00 jlam Exp $
+$NetBSD: patch-ad,v 1.12 2004/05/17 10:40:45 jlam Exp $
 
---- config-scripts/cups-libtool.m4.orig	Tue Dec 17 13:56:39 2002
-+++ config-scripts/cups-libtool.m4
-@@ -24,7 +24,7 @@ dnl
+--- config-scripts/cups-sharedlibs.m4.orig	Wed Jul 23 16:07:34 2003
++++ config-scripts/cups-sharedlibs.m4
+@@ -27,6 +27,24 @@ DSOFLAGS="${DSOFLAGS:=}"
  
- AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
-                           turn on building with libtool (UNSUPPORTED!), default=no],
--	[if test x$enable_libtool_unsupported != xno; then
-+	[if test x"$enable_libtool_unsupported" != xno; then
- 		LIBTOOL="$enable_libtool_unsupported"
- 		enable_shared=no
- 		echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
-@@ -36,7 +36,7 @@ AC_ARG_ENABLE(libtool_unsupported, [  --
+ AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
  
- AC_SUBST(LIBTOOL)
++AC_ARG_ENABLE(libtool, [  --enable-libtool[=LIBTOOL_PATH]
++                          turn on building with libtool (UNSUPPORTED!), default=no])
++
++if test x$enable_libtool != xno; then
++	echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
++	echo "         WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
++	echo "         (even if you have a support contract)"
++	enable_shared=no
++	if test x$enable_libtool = xyes; then
++		LIBTOOL=libtool
++	else
++		LIBTOOL=$enable_libtool
++	fi
++else
++	LIBTOOL=
++fi
++AC_SUBST(LIBTOOL)
++
+ if test x$enable_shared != xno; then
+ 	case "$uname" in
+ 		SunOS* | UNIX_S*)
+@@ -74,6 +92,10 @@ if test x$enable_shared != xno; then
+ 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+ 			;;
+ 	esac
++elif test x$enable_libtool != xno; then
++	LIBCUPS="libcups.la"
++	LIBCUPSIMAGE="libcupsimage.la"
++	DSO="\$(CC)"
+ else
+ 	PICFLAG=0
+ 	LIBCUPS="libcups.a"
+@@ -87,8 +109,13 @@ AC_SUBST(LIBCUPS)
+ AC_SUBST(LIBCUPSIMAGE)
  
--if test x$LIBTOOL != x; then
-+if test x"$LIBTOOL" != x; then
- 	LIBCUPS="libcups.la"
- 	LIBCUPSIMAGE="libcupsimage.la"
- 	LINKCUPS="../cups/\$(LIBCUPS)"
+ if test x$enable_shared = xno; then
+-	LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
+-	LINKCUPSIMAGE="../filter/libcupsimage.a"
++	if test x$enable_libtool = xno; then
++		LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
++		LINKCUPSIMAGE="../filter/libcupsimage.a"
++	else
++		LINKCUPS="../cups/\$(LIBCUPS)"
++		LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
++	fi
+ else
+ 	if test $uname = AIX; then
+ 		LINKCUPS="-lcups_s"
+@@ -113,10 +140,11 @@ if test "$DSO" != ":"; then
+ 	DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+ 	IMGLIBS=""
+ 
+-	# The *BSD, HP-UX, and Solaris run-time linkers need help when
+-	# deciding where to find a DSO.  Add linker options to tell them
+-	# where to find the DSO (usually in /usr/lib...  duh!)
+-	case $uname in
++	if test x$enable_libtool = xno; then
++		# The *BSD, HP-UX, and Solaris run-time linkers need help when
++		# deciding where to find a DSO.  Add linker options to tell them
++		# where to find the DSO (usually in /usr/lib...  duh!)
++		case $uname in
+                 HP-UX*)
+ 			# HP-UX
+                 	DSOFLAGS="+s +b $libdir $DSOFLAGS"
+@@ -141,7 +169,8 @@ if test "$DSO" != ":"; then
+                         LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+                         EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
+                         ;;
+-	esac
++		esac
++	fi
+ else
+ 	DSOLIBS=""
+ 	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index 15b432f274e..1d70c344af5 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.13 2004/01/10 03:32:09 jlam Exp $
+$NetBSD: patch-af,v 1.14 2004/05/17 10:40:45 jlam Exp $
 
 --- cups/Makefile.orig	Fri Aug 29 17:26:40 2003
 +++ cups/Makefile
@@ -12,66 +12,12 @@ $NetBSD: patch-af,v 1.13 2004/01/10 03:32:09 jlam Exp $
  
  installhdrs:
  	$(INSTALL_DIR) $(INCLUDEDIR)/cups
-@@ -109,7 +109,7 @@ installhdrs:
- 
- libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
-+	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS)
- 	$(RM) `basename $@ .2`
- 	$(LN) $@ `basename $@ .2`
- 
-@@ -124,7 +124,7 @@ libcups.2.dylib:	$(LIBOBJS) ../Makedefs
- 		-install_name $(libdir)/$@ \
- 		-current_version 2.5.0 \
- 		-compatibility_version 2.0.0 \
--		$(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
-+		$(LIBOBJS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS)
- 	$(RM) libcups.dylib
- 	$(LN) $@ libcups.dylib
- 
-@@ -137,7 +137,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
- 	echo Creating $@...
- 	$(RM) libcups_s.exp
- 	(echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp
--	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
-+	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) -lm
- 	$(RM) $@
- 	$(AR) $(ARFLAGS) $@ libcups_s.o
- 
 @@ -149,7 +149,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
  libcups.la:    $(LIBOBJS) ../Makedefs
  	echo Linking $@...
  	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
 -		-version-info 2:5 $(SSLLIBS) $(COMMONLIBS)
-+		-version-info 2:6 $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS)
- 
- 
- #
-@@ -179,7 +179,7 @@ cups_C.h:	../locale/C/cups_C
- 
- testhttp:	testhttp.o libcups.a
- 	echo Linking $@...
--	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
-+	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS)
- 
- 
- #
-@@ -188,7 +188,7 @@ testhttp:	testhttp.o libcups.a
- 
- testipp:	testipp.o libcups.a
- 	echo Linking $@...
--	$(CC) $(LDFLAGS) -o $@ testipp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
-+	$(CC) $(LDFLAGS) -o $@ testipp.o libcups.a $(NETLIBS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS)
- 
- 
- #
-@@ -197,7 +197,7 @@ testipp:	testipp.o libcups.a
- 
- testlang:	testlang.o libcups.a
- 	echo Linking $@...
--	$(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
-+	$(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS)
++		-version-info 2:6 $(SSLLIBS) $(COMMONLIBS)
  
  
  #
diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am
deleted file mode 100644
index 285b5956ed7..00000000000
--- a/print/cups/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.5 2003/05/28 02:34:01 jlam Exp $
-
---- config-scripts/cups-common.m4.orig	Wed May 14 14:24:38 2003
-+++ config-scripts/cups-common.m4
-@@ -81,8 +81,16 @@ dnl Architecture checks...
- AC_C_BIGENDIAN
- 
- dnl Check for libraries...
--AC_SEARCH_LIBS(crypt, crypt)
- AC_SEARCH_LIBS(getspent, sec gen)
-+
-+dnl Check for crypt() in libcrypt.  We need to link -lcrypt ahead of any
-+dnl OpenSSL libraries because the system crypt() is usually smarter than
-+dnl the libcrypto crypt() routine.
-+LIBCRYPT=""
-+AC_CHECK_LIB(crypt, crypt, LIBCRYPT="-lcrypt", LIBS="$LIBS -lcrypt")
-+EXPORT_LIBCRYPT="$LIBCRYPT"
-+AC_SUBST(LIBCRYPT)
-+AC_SUBST(EXPORT_LIBCRYPT)
- 
- LIBMALLOC=""
- AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])
diff --git a/print/cups/patches/patch-ap b/print/cups/patches/patch-ap
deleted file mode 100644
index d241f0cc559..00000000000
--- a/print/cups/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2004/01/10 03:32:09 jlam Exp $
-
---- cups-config.in.orig	Wed Sep 17 15:35:21 2003
-+++ cups-config.in
-@@ -40,7 +40,7 @@ cups_serverroot=@CUPS_SERVERROOT@
- # flags for C++ compiler:
- CFLAGS=""
- LDFLAGS="@EXPORT_LDFLAGS@"
--LIBS="@EXPORT_SSLLIBS@ @NETLIBS@ @COMMONLIBS@"
-+LIBS="@EXPORT_LIBCRYPT@ @EXPORT_SSLLIBS@ @NETLIBS@ @COMMONLIBS@"
- IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"
- 
- if test $includedir != /usr/include; then
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
deleted file mode 100644
index d6f9146ea67..00000000000
--- a/print/cups/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.3 2003/05/28 02:34:01 jlam Exp $
-
---- scheduler/Makefile.orig	Thu Apr 10 10:30:48 2003
-+++ scheduler/Makefile
-@@ -81,7 +81,7 @@ install:	all
- cupsd:	$(CUPSDOBJS) libmime.a ../cups/$(LIBCUPS)
- 	echo Linking $@...
- 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) libmime.a \
--		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(PAMLIBS) $(LIBS) \
-+		$(LIBZ) $(LIBCRYPT) $(SSLLIBS) $(LIBSLP) $(PAMLIBS) $(LIBS) \
- 		$(LIBPAPER) $(LIBMALLOC)
- 
-