summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjoerg <joerg>2009-11-26 17:16:47 +0000
committerjoerg <joerg>2009-11-26 17:16:47 +0000
commit952cc65dc76cf40b972732536b78ec6450db4ee9 (patch)
tree91ff63b6d2da7c6dbc09cb44c5ed7a4a3d9372a9 /wm
parent789c6a5a969ec94d4890b203ec715f8ebeac69e3 (diff)
downloadpkgsrc-952cc65dc76cf40b972732536b78ec6450db4ee9.tar.gz
Build modules with -fPIC. Bump revision. Add destdir support.
Diffstat (limited to 'wm')
-rw-r--r--wm/golem/Makefile15
-rw-r--r--wm/golem/distinfo3
-rw-r--r--wm/golem/patches/patch-ag12
3 files changed, 24 insertions, 6 deletions
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 7ae6c4a2572..e2550f78a1e 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2009/11/26 17:16:47 joerg Exp $
#
DISTNAME= golem-0.0.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/}
@@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://golem.sourceforge.net/
COMMENT= Fast and lightweight yet customizable window manager
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake yacc lex
GNU_CONFIGURE= YES
@@ -44,10 +46,13 @@ SUBST_FILES.paths= sample.golem/golemrc
SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_STAGE.paths= post-patch
+INSTALLATION_DIRS= ${EGDIR}
+INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
+ mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
post-install:
- ${RM} -f ${PREFIX}/share/golem/golemrc*
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sample.golem/golemrc ${EGDIR}/golemrc.default
+ ${RM} -f ${DESTDIR}${PREFIX}/share/golem/golemrc*
+ ${INSTALL_DATA} ${WRKSRC}/sample.golem/golemrc ${DESTDIR}${EGDIR}/golemrc.default
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/wm/golem/distinfo b/wm/golem/distinfo
index 5293e7e249a..7868657d9c6 100644
--- a/wm/golem/distinfo
+++ b/wm/golem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/12/06 15:20:31 joerg Exp $
+$NetBSD: distinfo,v 1.5 2009/11/26 17:16:47 joerg Exp $
SHA1 (golem-0.0.5.tar.gz) = 5939acf109502a2f962e20fa933b31970fb2ed74
RMD160 (golem-0.0.5.tar.gz) = 845d67cc96fbf34aca99c50bdccf4c1afdafb7f1
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = c3e61f79f0783aaaa06723f53029a7b67b1a2a9c
SHA1 (patch-ad) = ca2f91ea4587148543811729c8afc8e474b1c1ba
SHA1 (patch-ae) = 76ecf2c292a2d3af0a897a986e2a61c87dad4998
SHA1 (patch-af) = 3d74dacec56e4c953169300dd492ecdbb67d3302
+SHA1 (patch-ag) = 29b9e2068191a84d30224eb1103e68601a3da220
diff --git a/wm/golem/patches/patch-ag b/wm/golem/patches/patch-ag
new file mode 100644
index 00000000000..118f06b382d
--- /dev/null
+++ b/wm/golem/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2009/11/26 17:16:47 joerg Exp $
+
+--- plugins/Makefile.plugin.in.orig 2009-11-26 18:10:10.000000000 +0100
++++ plugins/Makefile.plugin.in
+@@ -1,6 +1,6 @@
+ # plugin makefiles include this
+ CC= @CC@
+-CFLAGS= @CFLAGS@ -I../../src/ -I../include/ @X_CFLAGS@
++CFLAGS= @CFLAGS@ -fPIC -I../../src/ -I../include/ @X_CFLAGS@
+ CFLAGS+= @DEFS@
+ LDFLAGS= @SHARED_FLAG@
+