Add DESTDIR support.

4 files changed, 17 insertions, 12 deletions

diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index c90ee25467c..f764c89cbe5 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/01/04 07:29:04 obache Exp $
+# $NetBSD: Makefile,v 1.44 2008/06/20 01:09:26 joerg Exp $
 
 DISTNAME=		gperiodic-2.0.8
 PKGREVISION=		3
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.frantz.fi/software/gperiodic.php
 COMMENT=		Displays a periodic table of the elements
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config
@@ -24,6 +26,8 @@ BUILD_TARGET=		gperiodic
 LIBS+=			-lintl
 MAKE_ENV+=		LIBS=${LIBS:M*:Q}
 
+INSTALLATION_DIRS=	bin share/gnome/apps/Applications share/pixmaps
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gperiodic/distinfo b/misc/gperiodic/distinfo
index 50048549360..b2fb9f97e57 100644
--- a/misc/gperiodic/distinfo
+++ b/misc/gperiodic/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/08/26 13:59:21 grant Exp $
+$NetBSD: distinfo,v 1.10 2008/06/20 01:09:26 joerg Exp $
 
 SHA1 (gperiodic-2.0.8.tar.gz) = b9d41c02ee8724b799280c7493aa2bb15a2d5cea
 RMD160 (gperiodic-2.0.8.tar.gz) = e799208c2233fbc9530c8e0b6a34fbcdba97931f
 Size (gperiodic-2.0.8.tar.gz) = 125402 bytes
-SHA1 (patch-aa) = 6292e54cacd3e00972e720b4da155663dc067664
-SHA1 (patch-ab) = 6f79492b0ce20681288323c8b113f6240a649bb2
+SHA1 (patch-aa) = 68ab285a7a112cf3b118a7a26c47501aafa7487b
+SHA1 (patch-ab) = fdc23a99123e334c7dae7a84645a567a33a443cf
 SHA1 (patch-ac) = b46b521544d4dff146e8b71e66ac8811b6b8525f
 SHA1 (patch-ad) = 0ec076c13f652737459c2b1bf680338c5da52016
diff --git a/misc/gperiodic/patches/patch-aa b/misc/gperiodic/patches/patch-aa
index 6e293cfd261..9517b980801 100644
--- a/misc/gperiodic/patches/patch-aa
+++ b/misc/gperiodic/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/08/26 13:59:22 grant Exp $
+$NetBSD: patch-aa,v 1.6 2008/06/20 01:09:26 joerg Exp $
 
 --- Makefile.orig	2003-08-10 05:33:27.000000000 +1000
 +++ Makefile
@@ -27,10 +27,10 @@ $NetBSD: patch-aa,v 1.5 2005/08/26 13:59:22 grant Exp $
 -	install gperiodic-crystal.png $(datadir)/pixmaps
 -	make clean
 +	cd po && ${MAKE} install enable_nls=1 datadir=$(datadir)
-+	${BSD_INSTALL_PROGRAM} gperiodic $(bindir)
-+	${BSD_INSTALL_DATA} gperiodic.desktop ${PREFIX}/share/gnome/apps/Applications
-+	${BSD_INSTALL_DATA} gperiodic.png $(datadir)/pixmaps
-+	${BSD_INSTALL_DATA} gperiodic-crystal.png $(datadir)/pixmaps
++	${BSD_INSTALL_PROGRAM} gperiodic ${DESTDIR}$(bindir)
++	${BSD_INSTALL_DATA} gperiodic.desktop ${DESTDIR}${PREFIX}/share/gnome/apps/Applications
++	${BSD_INSTALL_DATA} gperiodic.png ${DESTDIR}$(datadir)/pixmaps
++	${BSD_INSTALL_DATA} gperiodic-crystal.png ${DESTDIR}$(datadir)/pixmaps
  
  uninstall:
  	rm $(bindir)/gperiodic
diff --git a/misc/gperiodic/patches/patch-ab b/misc/gperiodic/patches/patch-ab
index a3a05485181..3c5d43bcd06 100644
--- a/misc/gperiodic/patches/patch-ab
+++ b/misc/gperiodic/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2003/12/14 12:38:30 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2008/06/20 01:09:26 joerg Exp $
 
 --- po/Makefile.orig	2003-08-09 21:34:22.000000000 +0200
 +++ po/Makefile
@@ -19,9 +19,10 @@ $NetBSD: patch-ab,v 1.2 2003/12/14 12:38:30 wiz Exp $
  	$(MAKE) all
 -	for f in $(FILES_MO) ; do mkdir -p \
 +	for f in $(FILES_MO) ; do $(BSD_INSTALL_DATA_DIR) \
- 		$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
+-		$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
++		${DESTDIR}$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
 -		cp $$f $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
-+		$(BSD_INSTALL_DATA) $$f $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
++		$(BSD_INSTALL_DATA) $$f ${DESTDIR}$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
  
  %.mo: %.po
  	$(MSGFMT) $(MSGFMT_OPT) $@ $<