Add DESTDIR support

4 files changed, 21 insertions, 12 deletions

diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 91ec49f3879..098d787e735 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/08/17 23:46:17 agc Exp $
 #
 
 DISTNAME=	wily-0.13.41
@@ -13,6 +13,7 @@ COMMENT=	Unix/X11 clone of the Plan9 acme editor/environment
 
 GNU_CONFIGURE=	yes
 CONFIGURE_HAS_MANDIR=	no
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	libXgFonts>=1.0nb1:../../fonts/Xg
 
diff --git a/editors/wily/distinfo b/editors/wily/distinfo
index d097ebdf75a..f43571dcf88 100644
--- a/editors/wily/distinfo
+++ b/editors/wily/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:15:13 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/08/17 23:46:18 agc Exp $
 
 SHA1 (wily-0.13.41.tgz) = 2d6c6dfbda2c7b7b37181aaac20b02f8954c69ee
 RMD160 (wily-0.13.41.tgz) = 970e6b90b1093ce1c8bad535aff9db90200763e6
 Size (wily-0.13.41.tgz) = 483429 bytes
-SHA1 (patch-aa) = 55be9c5a89e471f853d2c0f5090392d0d9de30cd
-SHA1 (patch-ab) = c4a7788468c6ca6a7abae7f0b195c1980e22968e
+SHA1 (patch-aa) = 5308659dd6b0100124f7a34dea425dc2161d6c61
+SHA1 (patch-ab) = a8076717ebafc3dbc66a838b9b9c9d4a62feaad2
diff --git a/editors/wily/patches/patch-aa b/editors/wily/patches/patch-aa
index 8c19bc9a696..7bbb7d88721 100644
--- a/editors/wily/patches/patch-aa
+++ b/editors/wily/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:19 agc Exp $
+$NetBSD: patch-aa,v 1.3 2007/08/17 23:46:18 agc Exp $
 
---- Makefile.in	1997/10/24 08:47:31	1.1
-+++ Makefile.in	1997/10/24 08:49:03
-@@ -17,6 +17,7 @@
+--- Makefile.in.orig	1997-05-03 07:37:17.000000000 +0100
++++ Makefile.in	2007-08-18 00:31:59.000000000 +0100
+@@ -17,6 +17,8 @@
  
  install:	all
  	cd wily; $(MAKE) $(MFLAGS) install
-+	@INSTALL@ -m 0444 Doc/old/wily.1 ${PREFIX}/man/man1
++	@INSTALL@ -d 0755 ${DESTDIR}${PREFIX}/man/man1
++	@INSTALL@ -m 0444 Doc/old/wily.1 ${DESTDIR}${PREFIX}/man/man1
  clean:
  	for i in $(SUBDIRS); do \
  		(cd $$i; $(MAKE) $(MFLAGS) $@); \
diff --git a/editors/wily/patches/patch-ab b/editors/wily/patches/patch-ab
index 94cfc1c41cc..c340f2e9893 100644
--- a/editors/wily/patches/patch-ab
+++ b/editors/wily/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:11:20 agc Exp $
+$NetBSD: patch-ab,v 1.3 2007/08/17 23:46:18 agc Exp $
 
---- wily/Makefile.in.orig	Fri Jun 20 11:58:06 1997
-+++ wily/Makefile.in	Tue Aug  4 21:54:46 1998
+--- wily/Makefile.in.orig	1997-06-20 10:58:06.000000000 +0100
++++ wily/Makefile.in	2007-08-18 00:33:21.000000000 +0100
 @@ -23,7 +23,7 @@
  	sam.o text.o click.o tile.o search.o
  
@@ -11,3 +11,10 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:11:20 agc Exp $
  all: $(TARGET)
  $(TARGET): $(OBJECTS) $(MYLIBS)
  	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(MYLIBS) $(XLIBS)
+@@ -47,4 +47,5 @@
+ dist:	nuke
+ 	cp -r `ls |grep -v RCS` ../dist/wily
+ install:	$(TARGET)
+-	cp $(TARGET) $(bindir)
++	mkdir -p ${DESTDIR}${bindir}
++	cp $(TARGET) ${DESTDIR}$(bindir)