DESTDIR support. Fix maintainer

6 files changed, 60 insertions, 7 deletions

diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index adac6cabee4..b69b7148a8d 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/01/23 21:14:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2009/02/16 14:15:28 joerg Exp $
 #
 
 DISTNAME=	whiteBOX-0.5
@@ -6,22 +6,24 @@ PKGREVISION=	6
 CATEGORIES=	wm x11
 MASTER_SITES=	http://whitebox.sourceforge.net/dist/
 
-MAINTAINER=	pkgsrc-users@@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://whitebox.sourceforge.net/
 COMMENT=	Multi-purpose configuration tool for Blackbox
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/whiteBOX/pixmaps share/whiteBOX/plugins
+
 # this prevents us from build-depending on autoconf and automake
 pre-install:
 	${RM} -f ${WRKSRC}/mkinstalldirs
 	${ECHO} "#!${SH}" > ${WRKSRC}/mkinstalldirs
 	${ECHO} "${ECHO}" >> ${WRKSRC}/mkinstalldirs
 	${CHMOD} 755  ${WRKSRC}/mkinstalldirs
-	${INSTALL_DATA_DIR} ${PREFIX}/share/whiteBOX/pixmaps
-	${INSTALL_DATA_DIR} ${PREFIX}/share/whiteBOX/plugins
 
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/whiteBOX/distinfo b/wm/whiteBOX/distinfo
index af14b81df20..485f5d0da6d 100644
--- a/wm/whiteBOX/distinfo
+++ b/wm/whiteBOX/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.5 2007/08/05 15:51:31 joerg Exp $
+$NetBSD: distinfo,v 1.6 2009/02/16 14:15:28 joerg Exp $
 
 SHA1 (whiteBOX-0.5.tar.gz) = 4bf73188cd2781a5cea6cf950438c6155e1059b3
 RMD160 (whiteBOX-0.5.tar.gz) = 8935581b9cd155cba00cc35efc65cdd0b8eaede8
 Size (whiteBOX-0.5.tar.gz) = 389934 bytes
-SHA1 (patch-aa) = d9fe28aa5b757f4b8fdb2f9be3b46151cb8fb268
+SHA1 (patch-aa) = 0d5ed1156bd19448fcf6953940ec4a87c66d059d
 SHA1 (patch-ab) = 2809ade224502b97252af35ccae269163b7b90a7
 SHA1 (patch-ac) = a3eeeeedc328133e439a43c9daac8349e211a524
 SHA1 (patch-ad) = 9becf38e5af3a42c99a7d836a315f3ac6814459b
 SHA1 (patch-ae) = 1da2b2dab1d03143b7450a93f1e3b8f9062ebe5b
 SHA1 (patch-af) = a1e67cbe3b8291d76faed1ad7b3e255c8eba3335
+SHA1 (patch-ag) = aef85c0cdcabe9480b76b22098e493eb8db7f741
+SHA1 (patch-ah) = 8f333f3f80cc1be78187548d18067344c502f9b8
+SHA1 (patch-ai) = aecdc7d397a2de35bf829741ae20959acb3bd9f5
diff --git a/wm/whiteBOX/patches/patch-aa b/wm/whiteBOX/patches/patch-aa
index 965a77f8870..60dfde948d0 100644
--- a/wm/whiteBOX/patches/patch-aa
+++ b/wm/whiteBOX/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2006/02/21 22:42:51 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2009/02/16 14:15:28 joerg Exp $
 
 --- src/plugins/menu/Makefile.in.orig	2002-12-14 03:50:17.000000000 +0000
 +++ src/plugins/menu/Makefile.in
+@@ -87,7 +87,7 @@ INCLUDES = \
+ 
+ lib_LTLIBRARIES = libwbmenu.la
+ 
+-libdir = $(DESTDIR)$(pkgdatadir)/plugins
++libdir = $(pkgdatadir)/plugins
+ 
+ CFLAGS = -g -O2 -Wall -I$(top_srcdir)/intl @GTK_CFLAGS@
+ 
 @@ -98,8 +98,8 @@ libwbmenu_la_SOURCES = \
          newitem.c newitem.h
  
diff --git a/wm/whiteBOX/patches/patch-ag b/wm/whiteBOX/patches/patch-ag
new file mode 100644
index 00000000000..c3681777841
--- /dev/null
+++ b/wm/whiteBOX/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2009/02/16 14:15:28 joerg Exp $
+
+--- src/plugins/bgset/Makefile.in.orig	2009-02-16 15:05:13.000000000 +0100
++++ src/plugins/bgset/Makefile.in
+@@ -88,7 +88,7 @@ INCLUDES = \
+ 
+ lib_LTLIBRARIES = libwbbgset.la
+ 
+-libdir = $(DESTDIR)$(pkgdatadir)/plugins
++libdir = $(pkgdatadir)/plugins
+ 
+ CFLAGS = -g -O2  -I$(top_srcdir)/intl @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@
+ 
diff --git a/wm/whiteBOX/patches/patch-ah b/wm/whiteBOX/patches/patch-ah
new file mode 100644
index 00000000000..425bd0eb2d5
--- /dev/null
+++ b/wm/whiteBOX/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2009/02/16 14:15:28 joerg Exp $
+
+--- src/plugins/keybind/Makefile.in.orig	2009-02-16 15:05:47.000000000 +0100
++++ src/plugins/keybind/Makefile.in
+@@ -87,7 +87,7 @@ INCLUDES = \
+ 
+ lib_LTLIBRARIES = libwbkeybind.la
+ 
+-libdir = $(DESTDIR)$(pkgdatadir)/plugins
++libdir = $(pkgdatadir)/plugins
+ 
+ CFLAGS = -O2  -I$(top_srcdir)/intl @GTK_CFLAGS@
+ 
diff --git a/wm/whiteBOX/patches/patch-ai b/wm/whiteBOX/patches/patch-ai
new file mode 100644
index 00000000000..da6315b3d62
--- /dev/null
+++ b/wm/whiteBOX/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2009/02/16 14:15:28 joerg Exp $
+
+--- src/plugins/style/Makefile.in.orig	2009-02-16 15:07:00.000000000 +0100
++++ src/plugins/style/Makefile.in
+@@ -87,7 +87,7 @@ INCLUDES = \
+ 
+ lib_LTLIBRARIES = libwbstyle.la
+ 
+-libdir = $(DESTDIR)$(pkgdatadir)/plugins
++libdir = $(pkgdatadir)/plugins
+ 
+ CFLAGS = -g -O2 -Wall -I$(top_srcdir)/intl @GTK_CFLAGS@
+