Fix build on amd64

5 files changed, 72 insertions, 6 deletions

diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index b3cce3942f2..f0866bdfe7f 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/08/23 16:16:37 khorben Exp $
+# $NetBSD: Makefile,v 1.19 2015/08/27 09:14:52 khorben Exp $
 #
 
 DISTNAME=	Panel-0.3.2
@@ -24,6 +24,7 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 AUTO_MKDIRS=	yes
 
 LDFLAGS.SunOS+=	-lsocket
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index bc84b274773..851f16baab7 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/08/23 16:16:37 khorben Exp $
+$NetBSD: distinfo,v 1.9 2015/08/27 09:14:52 khorben Exp $
 
 SHA1 (Panel-0.3.2.tar.gz) = bfcb5d33b94e2cfa3abd94450b75a7976abc2fac
 RMD160 (Panel-0.3.2.tar.gz) = 6877ffb5386e98babf29a092658a3bcbdcfa1b9a
 Size (Panel-0.3.2.tar.gz) = 141549 bytes
-SHA1 (patch-tools_Makefile) = 642887110b585cd6b78d0cf43acc4f826b1abcae
+SHA1 (patch-src_Makefile) = 2ba5d7442603d2a8f4b389465e5eeb776f7845aa
+SHA1 (patch-src_applets_Makefile) = 7dacfeab866a72b508713abdbfe724cda5c20d5a
+SHA1 (patch-tools_Makefile) = f05ebc04da359e181de0e7d44de8b960a3c266f8
diff --git a/x11/deforaos-panel/patches/patch-src_Makefile b/x11/deforaos-panel/patches/patch-src_Makefile
new file mode 100644
index 00000000000..a464077b1c0
--- /dev/null
+++ b/x11/deforaos-panel/patches/patch-src_Makefile
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_Makefile,v 1.1 2015/08/27 09:14:52 khorben Exp $
+
+Fix build on amd64
+
+--- src/Makefile.orig	2015-08-10 23:33:27.000000000 +0000
++++ src/Makefile
+@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
+ CC	= cc
+ CPPFLAGSF=
+ CPPFLAGS=
+-CFLAGSF	= -W
+-CFLAGS	= -Wall -g -O2 -pedantic -fPIC -fstack-protector
++CFLAGSF	= -fPIC
++CFLAGS	= -W -Wall -g -O2 -pedantic -fstack-protector
+ AR	= ar
+ RANLIB	= ranlib
+ CCSHARED= $(CC) -shared
+@@ -40,21 +40,21 @@ $(OBJDIR)libPanel.so: $(OBJDIR)libPanel.
+ 
+ panel_OBJS = $(OBJDIR)main.o
+ panel_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop`
+-panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl -L. -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel -Wl,-pie
++panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl -L. -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel
+ 
+ $(OBJDIR)panel: $(panel_OBJS) $(OBJDIR)libPanel.a
+ 	$(CC) -o $(OBJDIR)panel $(panel_OBJS) $(panel_LDFLAGS)
+ 
+ panelctl_OBJS = $(OBJDIR)panelctl.o
+ panelctl_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop`
+-panelctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl -Wl,-pie
++panelctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl
+ 
+ $(OBJDIR)panelctl: $(panelctl_OBJS)
+ 	$(CC) -o $(OBJDIR)panelctl $(panelctl_OBJS) $(panelctl_LDFLAGS)
+ 
+ run_OBJS = $(OBJDIR)run.o
+ run_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
+-run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lintl -Wl,-pie
++run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lintl
+ 
+ $(OBJDIR)run: $(run_OBJS)
+ 	$(CC) -o $(OBJDIR)run $(run_OBJS) $(run_LDFLAGS)
diff --git a/x11/deforaos-panel/patches/patch-src_applets_Makefile b/x11/deforaos-panel/patches/patch-src_applets_Makefile
new file mode 100644
index 00000000000..b974deaaff4
--- /dev/null
+++ b/x11/deforaos-panel/patches/patch-src_applets_Makefile
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_applets_Makefile,v 1.1 2015/08/27 09:14:52 khorben Exp $
+
+Fix build on amd64
+
+--- src/applets/Makefile.orig	2015-08-10 23:33:27.000000000 +0000
++++ src/applets/Makefile
+@@ -6,10 +6,10 @@ LIBDIR	= $(PREFIX)/lib
+ CC	= cc
+ CPPFLAGSF= -I ../../include
+ CPPFLAGS=
+-CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
+-CFLAGS	= -Wall -g -O2 -pedantic -fPIC -fstack-protector
+-LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0` -lPanel
+-LDFLAGS	= -L$(OBJDIR)..
++CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0` -fPIC
++CFLAGS	= -W -Wall -g -O2 -pedantic -fstack-protector
++LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0` -lPanel -L$(OBJDIR)..
++LDFLAGS	=
+ AR	= ar
+ RANLIB	= ranlib
+ CCSHARED= $(CC) -shared
diff --git a/x11/deforaos-panel/patches/patch-tools_Makefile b/x11/deforaos-panel/patches/patch-tools_Makefile
index 81f844cfdae..381486a7cf0 100644
--- a/x11/deforaos-panel/patches/patch-tools_Makefile
+++ b/x11/deforaos-panel/patches/patch-tools_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2014/10/24 18:21:06 khorben Exp $
+$NetBSD: patch-tools_Makefile,v 1.2 2015/08/27 09:14:52 khorben Exp $
 
---- tools/Makefile.orig	2014-10-23 17:35:58.000000000 +0000
+--- tools/Makefile.orig	2015-08-10 23:33:27.000000000 +0000
 +++ tools/Makefile
-@@ -2,6 +2,7 @@ TARGETS	= panel-embed panel-message pane
+@@ -3,6 +3,7 @@ OBJDIR	=
  PREFIX	= /usr/local
  DESTDIR	=
  BINDIR	= $(PREFIX)/bin