From fcd1239d719de80b66e08f69ea7fd467057bfd37 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 5 Jul 2001 17:31:27 +0000
Subject: Add SSL settings to this Makefile and remove SSL settings from
 buildlink.mk.  Also add $(KDE_RPATH) to some Makefiles to properly compile
 when libqt.la isn't found.  The USER_LDFLAGS setting is thus unnecessary.

---
 x11/kdelibs2/Makefile     | 23 +++++++++++++++++++++--
 x11/kdelibs2/buildlink.mk |  3 +--
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'x11')

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index f5afa86104c..9edcca733c5 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/05 05:53:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/07/05 17:31:27 jlam Exp $
 #
 
 DISTNAME=	kdelibs-2.1
@@ -19,7 +19,7 @@ LTCONFIG_OVERRIDE+=	${WRKSRC}/ksgmltools/ltconfig
 .include "../../devel/pcre/buildlink.mk"
 .endif
 
-CONFIGURE_ENV+=		USER_LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_DIR}"
 LIBS+=			-Wl,--export-dynamic
 
 MKDIRS=	share/kde/icons/locolor/32x32/actions/kde \
@@ -29,6 +29,25 @@ MKDIRS=	share/kde/icons/locolor/32x32/actions/kde \
 	share/kde/icons/hicolor/22x22/mimetypes \
 	share/kde/icons/hicolor/22x22/filesystems
 
+KDE_RPATH_MAKEFILES=	dcop/Makefile.in
+
+# Add a missing $(KDE_RPATH) to the LDFLAGS setting in several Makefiles.
+fix:
+	@cd ${WRKSRC};							\
+	for file in ${KDE_RPATH_MAKEFILES:S/.in$//}; do			\
+		${SED}	-e "s,\(^LDFLAGS.*\),\1 \$$(KDE_RPATH),"	\
+			$${file} > $${file}.add-kde-rpath;		\
+		${MV} -f $${file}.add-kde-rpath $${file};		\
+	done
+
+post-patch:
+	@cd ${WRKSRC};							\
+	for file in ${KDE_RPATH_MAKEFILES}; do				\
+		${SED}	-e "s,\(^LDFLAGS.*\),\1 \$$(KDE_RPATH),"	\
+			$${file} > $${file}.add-kde-rpath;		\
+		${MV} -f $${file}.add-kde-rpath $${file};		\
+	done
+
 post-install:
 	for d in ${MKDIRS}; do \
 		${INSTALL_DATA_DIR} ${PREFIX}/$$d; \
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index e7722ce6367..e51a8aea70f 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/05 05:53:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/05 17:31:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
@@ -33,7 +33,6 @@ BUILDLINK_FILES.kdelibs2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdel
 .include "../../audio/libaudiofile/buildlink.mk"
 .include "../../devel/libtool/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
 .include "../../textproc/jade/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
 
-- 
cgit v1.2.3