Fri Jul 5 15:10:00 2013 UTC ()
Apply removal of -export-dynamic for SunOS across all of pkgsrc.

Avoids lots of copy/paste and fixes a bunch of packages which hadn't been
looked at yet.


(jperkin)
diff -r1.28 -r1.29 pkgsrc/audio/albumplayer/Makefile
diff -r1.45 -r1.46 pkgsrc/audio/audacious-plugins/Makefile
diff -r1.33 -r1.34 pkgsrc/audio/glurp/Makefile
diff -r1.22 -r1.23 pkgsrc/audio/moc/Makefile
diff -r1.14 -r1.15 pkgsrc/audio/moc-devel/Makefile
diff -r1.9 -r1.10 pkgsrc/cad/gplcver/Makefile
diff -r1.36 -r1.37 pkgsrc/chat/pidgin-latex/Makefile
diff -r1.51 -r1.52 pkgsrc/mk/platform/SunOS.mk
diff -r1.41 -r1.42 pkgsrc/wm/awesome/Makefile
cvs diff -r1.28 -r1.29 pkgsrc/audio/albumplayer/Attic/Makefile (expand / switch to context diff)
--- pkgsrc/audio/albumplayer/Attic/Makefile 2013/06/06 12:54:01 1.28
+++ pkgsrc/audio/albumplayer/Attic/Makefile 2013/07/05 15:10:00 1.29
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/06/06 12:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=	albumplayer-0.3.1
@@ -18,11 +18,6 @@
 USE_TOOLS+=		pkg-config
 INSTALLATION_DIRS+=	share/applications
 REPLACE_SH=		ap_flac_embed
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-export-dynamic
-.endif
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
cvs diff -r1.45 -r1.46 pkgsrc/audio/audacious-plugins/Makefile (expand / switch to context diff)
--- pkgsrc/audio/audacious-plugins/Makefile 2013/07/05 13:29:28 1.45
+++ pkgsrc/audio/audacious-plugins/Makefile 2013/07/05 15:10:00 1.46
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2013/07/05 13:29:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=		audacious-plugins-1.5.1
@@ -55,7 +55,6 @@
 .elif ${OPSYS} == "DragonFly"
 PLIST.oss=	yes
 .elif ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Wl,-export-dynamic
 CPPFLAGS.SunOS=	-D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
 CONFIGURE_ARGS+=	--enable-oss4
 PLIST.oss4=	yes
cvs diff -r1.33 -r1.34 pkgsrc/audio/glurp/Makefile (expand / switch to context diff)
--- pkgsrc/audio/glurp/Makefile 2013/06/06 12:54:03 1.33
+++ pkgsrc/audio/glurp/Makefile 2013/07/05 15:10:00 1.34
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=	glurp-0.12.3
@@ -15,11 +15,6 @@
 USE_TOOLS+=	intltool pkg-config
 
 LIBS.SunOS+=	-lsocket -lnsl
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-export-dynamic
-.endif
 
 .include "../../audio/libmpd/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
cvs diff -r1.22 -r1.23 pkgsrc/audio/moc/Makefile (expand / switch to context diff)
--- pkgsrc/audio/moc/Makefile 2013/06/16 13:00:59 1.22
+++ pkgsrc/audio/moc/Makefile 2013/07/05 15:10:00 1.23
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/06/16 13:00:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/05 15:10:00 jperkin Exp $
 
 DISTNAME=		moc-2.4.4
 CATEGORIES=		audio
@@ -34,11 +34,6 @@
 #USE_TOOLS+=		autoconf automake
 #pre-configure:
 #	cd ${WRKSRC} && autoreconf -v -i
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Wl,--export-dynamic
-.endif
 
 LIBS.SunOS+=	-lsocket
cvs diff -r1.14 -r1.15 pkgsrc/audio/moc-devel/Attic/Makefile (expand / switch to context diff)
--- pkgsrc/audio/moc-devel/Attic/Makefile 2013/02/17 10:14:11 1.14
+++ pkgsrc/audio/moc-devel/Attic/Makefile 2013/07/05 15:10:00 1.15
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/02/17 10:14:11 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/05 15:10:00 jperkin Exp $
 
 DISTNAME=		moc-2.5.0-beta1
 PKGNAME=		${DISTNAME:S/-beta/b/:moc%=moc-devel%}
@@ -34,11 +34,6 @@
 #	cd ${WRKSRC} && autoreconf -v -i
 post-extract:
 	${CP} ${FILESDIR}/getline.c ${WRKSRC}
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=   rm:-Wl,--export-dynamic
-.endif
 
 LIBS.SunOS+=    -lsocket
cvs diff -r1.9 -r1.10 pkgsrc/cad/gplcver/Makefile (expand / switch to context diff)
--- pkgsrc/cad/gplcver/Makefile 2012/10/08 13:25:13 1.9
+++ pkgsrc/cad/gplcver/Makefile 2013/07/05 15:10:00 1.10
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 13:25:13 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=		gplcver-2.12a.src
@@ -17,11 +17,6 @@
 BUILDLINK_LIBS.dl=	${BUILDLINK_LDADD.dl}
 
 INSTALLATION_DIRS=	bin lib/gplcver/pli_incs
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-export-dynamic
-.endif
 
 .include "../../mk/dlopen.buildlink3.mk"
cvs diff -r1.36 -r1.37 pkgsrc/chat/pidgin-latex/Makefile (expand / switch to context diff)
--- pkgsrc/chat/pidgin-latex/Makefile 2013/06/06 12:54:09 1.36
+++ pkgsrc/chat/pidgin-latex/Makefile 2013/07/05 15:10:00 1.37
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/05 15:10:00 jperkin Exp $
 
 VERSION=	1.2.1
 PKGREVISION=	30
@@ -29,11 +29,6 @@
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pidgin-latex/
 
 DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Wl,--export-dynamic
-.endif
 
 .include "../../chat/pidgin/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
cvs diff -r1.51 -r1.52 pkgsrc/mk/platform/SunOS.mk (expand / switch to context diff)
--- pkgsrc/mk/platform/SunOS.mk 2013/05/16 17:09:07 1.51
+++ pkgsrc/mk/platform/SunOS.mk 2013/07/05 15:10:00 1.52
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.51 2013/05/16 17:09:07 jperkin Exp $
+# $NetBSD: SunOS.mk,v 1.52 2013/07/05 15:10:00 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -66,6 +66,10 @@
 # ld is not currently supported.
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-z allextract
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-z defaultextract
+
+# Remove flags specific to GNU ld.
+BUILDLINK_TRANSFORM+=	rm:-Wl,--export-dynamic
+BUILDLINK_TRANSFORM+=	rm:-export-dynamic
 
 # Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it
 # incompatible.
cvs diff -r1.41 -r1.42 pkgsrc/wm/awesome/Makefile (expand / switch to context diff)
--- pkgsrc/wm/awesome/Makefile 2013/07/05 13:29:43 1.41
+++ pkgsrc/wm/awesome/Makefile 2013/07/05 15:10:00 1.42
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/07/05 13:29:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=	awesome-3.4.13
@@ -47,12 +47,7 @@
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 BUILD_DEPENDS+=	docbook-xml-[0-9]*:../../textproc/docbook-xml
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=		-liconv
-BUILDLINK_TRANSFORM+=	rm:-export-dynamic
-.endif
+LDFLAGS.SunOS+=		-liconv
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"