* Add user-destdir installation support.

* set LICENSE=gnu-gpl-v2.

3 files changed, 75 insertions, 2 deletions

diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile
index 9778ec663d0..8d85d94832c 100644
--- a/sysutils/xfm/Makefile
+++ b/sysutils/xfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/02/01 15:14:08 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/03/07 09:03:14 obache Exp $
 
 DISTNAME=	xfm-1.4.3
 PKGREVISION=	2
@@ -8,6 +8,9 @@ MASTER_SITES=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 COMMENT=	The X File Manager
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET+=	all xfm.install.script Xfm.ad
 
diff --git a/sysutils/xfm/distinfo b/sysutils/xfm/distinfo
index ffb8eb7a5ff..3f7902ed2da 100644
--- a/sysutils/xfm/distinfo
+++ b/sysutils/xfm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/03/29 22:39:49 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/03/07 09:03:14 obache Exp $
 
 SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2
 RMD160 (xfm-1.4.3.tar.gz) = b06c562b467e5085e5ecdd4273b64d554415ce69
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 40a32177cc5b64a49a51ea9c77062bfdc77da75d
 SHA1 (patch-ad) = 64709ecb67e91d8677545a7af54fa205079a77fd
 SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d
 SHA1 (patch-af) = 575a1a38b9a99d387779254a9dd7bb7c037c50dc
+SHA1 (patch-ag) = 5c825371254e0056c5b932901bacc5599dd514d2
diff --git a/sysutils/xfm/patches/patch-ag b/sysutils/xfm/patches/patch-ag
new file mode 100644
index 00000000000..fa9be2f7c13
--- /dev/null
+++ b/sysutils/xfm/patches/patch-ag
@@ -0,0 +1,69 @@
+$NetBSD: patch-ag,v 1.1 2010/03/07 09:03:15 obache Exp $
+
+destdir installation support
+
+--- Imakefile.orig	1997-10-29 12:19:02.000000000 +0000
++++ Imakefile
+@@ -37,7 +37,7 @@ InstallManSubdirs(Subdirs)
+ 
+ CppScriptTarget(xfm.install.script,bin/xfm.install.cpp,\
+ -DLIBDIR=$(XFMLIBDIR),)
+-InstallScript(xfm.install,$(DESTDIR)$(BINDIR))
++InstallScript(xfm.install,$(BINDIR))
+ 
+ /* rules to create and install the appdefaults file, the config files and the
+    pixmaps */
+@@ -53,32 +53,32 @@ CppFileTarget(Xfm.ad,lib/Xfm.cpp,-DLIBDI
+ InstallAppDefaults(Xfm)
+ 
+ install::
+-	MakeDir($(XFMLIBDIR)/bitmaps)
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/bitmaps/?* $(XFMLIBDIR)/bitmaps
+-	MakeDir($(XFMLIBDIR)/pixmaps)
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/pixmaps/?* $(XFMLIBDIR)/pixmaps
++	MakeDir($(DESTDIR)$(XFMLIBDIR)/bitmaps)
++	$(INSTALL) -c $(INSTDATFLAGS) lib/bitmaps/?* $(DESTDIR)$(XFMLIBDIR)/bitmaps
++	MakeDir($(DESTDIR)$(XFMLIBDIR)/pixmaps)
++	$(INSTALL) -c $(INSTDATFLAGS) lib/pixmaps/?* $(DESTDIR)$(XFMLIBDIR)/pixmaps
+ 
+ #ifndef USE_3DICONS
+ install::
+-	MakeDir($(XFMLIBDIR)/dot.xfm)
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/$(XFMRC) $(XFMLIBDIR)/dot.xfm/xfmrc
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/xfmdev $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/magic $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/Apps $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/Graphics $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/Hosts $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) lib/Toolbox $(XFMLIBDIR)/dot.xfm
++	MakeDir($(DESTDIR)$(XFMLIBDIR)/dot.xfm)
++	$(INSTALL) -c $(INSTDATFLAGS) lib/$(XFMRC) $(DESTDIR)$(XFMLIBDIR)/dot.xfm/xfmrc
++	$(INSTALL) -c $(INSTDATFLAGS) lib/xfmdev $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) lib/magic $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) lib/Apps $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) lib/Graphics $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) lib/Hosts $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) lib/Toolbox $(DESTDIR)$(XFMLIBDIR)/dot.xfm
+ #else
+ install::
+-	MakeDir($(XFMLIBDIR)/icons)
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/icons/?* $(XFMLIBDIR)/icons
+-	MakeDir($(XFMLIBDIR)/dot.xfm)
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/xfmrc $(XFMLIBDIR)/dot.xfm/xfmrc
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/xfmdev $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/magic $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/Apps $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/Graphics $(XFMLIBDIR)/dot.xfm
+-	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/Toolbox $(XFMLIBDIR)/dot.xfm
++	MakeDir($(DESTDIR)$(XFMLIBDIR)/icons)
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/icons/?* $(DESTDIR)$(XFMLIBDIR)/icons
++	MakeDir($(DESTDIR)$(XFMLIBDIR)/dot.xfm)
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/xfmrc $(DESTDIR)$(XFMLIBDIR)/dot.xfm/xfmrc
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/xfmdev $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/magic $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/Apps $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/Graphics $(DESTDIR)$(XFMLIBDIR)/dot.xfm
++	$(INSTALL) -c $(INSTDATFLAGS) contrib/3dicons/Toolbox $(DESTDIR)$(XFMLIBDIR)/dot.xfm
+ #endif
+ 
+ /* Use the following before installing over an existing version of xfm. (You