Use -Wl for linker flags.

4 files changed, 67 insertions, 1 deletions

diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 27a6fb6b197..07386a230f2 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2012/02/04 21:10:43 adam Exp $
+$NetBSD: distinfo,v 1.66 2012/05/04 16:17:38 joerg Exp $
 
 SHA1 (gimp-2.6.12.tar.bz2) = 82964e3d4eb003239f3443a1bccac53f5d780e15
 RMD160 (gimp-2.6.12.tar.bz2) = 3c7ae863474dea670eaeb914e333ba6bf50c7fcc
@@ -7,4 +7,7 @@ SHA1 (patch-aa) = 91b8f1aa493ab9991ec619268143db748bb6bb9d
 SHA1 (patch-ab) = 99a09ad2b0513d28d321b6a698bba3dc6614f2bc
 SHA1 (patch-ac) = 42f44b45640bdde305c1e52b95ee633360ebccb8
 SHA1 (patch-ad) = 4e2ce2f7d8729fb760eac1bad89cfe09fef499b0
+SHA1 (patch-app_Makefile.in) = 356d97e414d1a8b6c0e23b03cc1338d4c0bae028
+SHA1 (patch-app_config_Makefile.in) = 5b7d56eb83aa0e88ccac712256028cd1b7f878e4
+SHA1 (patch-devel-docs_app_Makefile.in) = 931ccc245b7d70962d4fa43f30cbd5ddd8773d3b
 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 88c99c5dc97a8a5a8708eed8cbb1d4bb6be1abe0
diff --git a/graphics/gimp/patches/patch-app_Makefile.in b/graphics/gimp/patches/patch-app_Makefile.in
new file mode 100644
index 00000000000..502c81b7b51
--- /dev/null
+++ b/graphics/gimp/patches/patch-app_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-app_Makefile.in,v 1.1 2012/05/04 16:17:39 joerg Exp $
+
+--- app/Makefile.in.orig	2012-04-27 17:59:44.000000000 +0000
++++ app/Makefile.in
+@@ -556,12 +556,12 @@ INCLUDES = \
+ AM_LDFLAGS = \
+ 	$(munix)					\
+ 	$(CARBON_LDFLAGS)				\
+-	-u $(SYMPREFIX)xcf_init				\
+-	-u $(SYMPREFIX)internal_procs_init		\
+-	-u $(SYMPREFIX)gimp_coords_mix			\
+-	-u $(SYMPREFIX)gimp_curve_map_pixels		\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore
++	-Wl,-u,$(SYMPREFIX)xcf_init				\
++	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
++	-Wl,-u,$(SYMPREFIX)gimp_coords_mix			\
++	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels		\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
+ 
+ gimp_2_6_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags) 
+ gimp_2_6_LDADD = \
diff --git a/graphics/gimp/patches/patch-app_config_Makefile.in b/graphics/gimp/patches/patch-app_config_Makefile.in
new file mode 100644
index 00000000000..eefc5e33d39
--- /dev/null
+++ b/graphics/gimp/patches/patch-app_config_Makefile.in
@@ -0,0 +1,21 @@
+$NetBSD: patch-app_config_Makefile.in,v 1.1 2012/05/04 16:17:39 joerg Exp $
+
+--- app/config/Makefile.in.orig	2012-04-27 17:59:47.000000000 +0000
++++ app/config/Makefile.in
+@@ -444,11 +444,11 @@ libappconfig_a_SOURCES = \
+ EXTRA_DIST = makefile.msc
+ test_config_DEPENDENCIES = $(gimpconfig_libs)
+ test_config_LDFLAGS = \
+-	-u $(SYMPREFIX)xcf_init				\
+-	-u $(SYMPREFIX)internal_procs_init		\
+-	-u $(SYMPREFIX)gimp_coords_mix			\
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type
++	-Wl,-u,$(SYMPREFIX)xcf_init				\
++	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
++	-Wl,-u,$(SYMPREFIX)gimp_coords_mix			\
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
+ 
+ test_config_LDADD = \
+ 	../widgets/widgets-enums.o		\
diff --git a/graphics/gimp/patches/patch-devel-docs_app_Makefile.in b/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
new file mode 100644
index 00000000000..855f9afe720
--- /dev/null
+++ b/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-devel-docs_app_Makefile.in,v 1.1 2012/05/04 16:17:39 joerg Exp $
+
+--- devel-docs/app/Makefile.in.orig	2012-04-27 17:59:56.000000000 +0000
++++ devel-docs/app/Makefile.in
+@@ -423,10 +423,10 @@ GTKDOC_CFLAGS = \
+ 	-UGTK_DISABLE_SINGLE_INCLUDES
+ 
+ GTKDOC_LIBS = \
+-	-u $(SYMPREFIX)xcf_init		   				     \
+-	-u $(SYMPREFIX)internal_procs_init 				     \
+-	-u $(SYMPREFIX)gimp_coords_mix	   				     \
+-	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
++	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
++	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
++	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
++	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
+ 	$(top_builddir)/app/app.o					     \
+         $(top_builddir)/app/batch.o					     \
+         $(top_builddir)/app/errors.o					     \