PKG_DESTDIR_SUPPORT

21 files changed, 115 insertions, 64 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index c9b59e5b36a..34b9bbe2d0d 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/05/20 00:58:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2009/12/17 20:31:37 abs Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -15,26 +15,27 @@ EXTRACT_ONLY=		felt-3.05.src.tar.gz
 
 WRKSRC=			${WRKDIR}/FElt-3.05
 USE_X11BASE=		yes
+USE_TOOLS+=		gzcat
 XAW_TYPE?=		3d
 
 MAKE_ENV+=		CCOPTS=${CFLAGS:M*:Q}
 MAKE_ENV+=		LDOPTS=${LDFLAGS:M*:Q}
 MAKE_ENV+=		SH=${SH:Q}
 
-USE_GNU_READLINE=	# uses remove_history() and history_list()
+USE_GNU_READLINE=	YES # uses remove_history() and history_list()
 
-INSTALLATION_DIRS=	lib/X11/app-defaults share/doc/felt share/examples/felt
+INSTALLATION_DIRS+=	lib/X11/app-defaults share/doc/felt share/examples/felt
+INSTALLATION_DIRS+=	share/examples/felt share/doc/felt
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 post-extract:
-	@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
+	${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/felt
-	${INSTALL_DATA} ${WRKSRC}/felt.ps ${PREFIX}/share/doc/felt
+	${INSTALL_DATA} ${WRKSRC}/felt.ps ${DESTDIR}${PREFIX}/share/doc/felt
 	cd ${WRKSRC} && ${INSTALL_DATA} FAQ FAQ.html README README.old	\
-		COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
+		COPYING CHANGELOG TODO ${DESTDIR}${PREFIX}/share/doc/felt
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/share/examples/felt
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index 9db731ab602..ea2e34d3ee2 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2008/08/02 19:59:21 dholland Exp $
+$NetBSD: distinfo,v 1.15 2009/12/17 20:31:37 abs Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a
@@ -6,19 +6,22 @@ Size (felt-3.05.src.tar.gz) = 956901 bytes
 SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1
 Size (felt-3.05.ps.gz) = 626985 bytes
-SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
-SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5
-SHA1 (patch-ac) = 4bbdbf6c4fd597cbdaa355c5da9d6a46d649b66e
-SHA1 (patch-ad) = b39e8556168d434dc156915e5f33b1eaf5745144
-SHA1 (patch-ae) = 96d50e03a7996ed5a57e4d17846608029552a7ea
-SHA1 (patch-af) = 3be12b2c927219420424bdd8fd67cc12739aba99
-SHA1 (patch-ag) = 4c6f78e5869aab7a1d20c4086fc3cd0dc8edbe2d
-SHA1 (patch-ah) = 97b61774130ed3a0fb4c053776ed1cbd7dc42c38
-SHA1 (patch-ai) = b6c2d940d4ca9fc18439bdda0aa0a436a20787a9
-SHA1 (patch-aj) = 81a1abf01df1818a3779153fb68dcb50ded195f9
-SHA1 (patch-ak) = 58591211dd9a04983613be83b1e479ef9ea833a7
-SHA1 (patch-al) = 1918af0d648ae4f00a720f5402524980588467c8
-SHA1 (patch-am) = cee82a628575135bf8cc45c4737ab679b5cffe72
-SHA1 (patch-an) = 00a2196b96bfe0823ba58bb444576131df398682
-SHA1 (patch-ao) = 749e6edcb0061e39371ef4be668b4523c3e4dd89
-SHA1 (patch-ap) = bef0795860964285c41f7845362f4fef63726191
+SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160
+SHA1 (patch-ab) = 0db67c162ea81b7b7650ae1d62f0e89235067b53
+SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f
+SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643
+SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55
+SHA1 (patch-af) = efe9378b488d1425ea284ec29c838359aa8f6a9b
+SHA1 (patch-ag) = 392eb3d708ab4b2004586d3203ec64a778dce886
+SHA1 (patch-ah) = d48f55d8cc9c3b6d1bc75b56e4f8023e42e6d37e
+SHA1 (patch-ai) = 00d557b31d2b912de9f952a4f76f2742e98dca1a
+SHA1 (patch-aj) = 9104b418485bdd9f56c699ac4be9ed64422d19d2
+SHA1 (patch-ak) = 0ad726e6992a822ffcf32367f06305ac6ea818cc
+SHA1 (patch-al) = 3267802ff6467ffc37cb4de564b005bf1ceb91ac
+SHA1 (patch-am) = de488591d0d7abace294ccb9a9aa6914b2b9fd4d
+SHA1 (patch-an) = 70195df18c833e46d354e9f2a0212e2bf03e68d2
+SHA1 (patch-ao) = 23106adc13a2ea06f94be807a188c8320f4fde8a
+SHA1 (patch-ap) = 69650c94ca86ec069049a4fc58553534f26ea4bf
+SHA1 (patch-aq) = 2265c8e39c1a9bf2cb4f423fabf1dd6128d16210
+SHA1 (patch-ar) = 3915c952bc526d10acd5245b33835c2f76002e93
+SHA1 (patch-as) = 76dd3f51b62eac4d3e2ca6bbf8d579bdad84a3d2
diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa
index 8fbeb35084d..f3a8130467e 100644
--- a/cad/felt/patches/patch-aa
+++ b/cad/felt/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2002/09/21 06:31:43 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2009/12/17 20:31:37 abs Exp $
 
---- etc/Makefile.conf.orig	Sat Mar  4 20:37:06 2000
-+++ etc/Makefile.conf	Tue May 22 12:21:18 2001
+--- etc/Makefile.conf.orig	2000-03-05 01:37:06.000000000 +0000
++++ etc/Makefile.conf
 @@ -1,26 +1,26 @@
 -AR		= ar
 -CC		= gcc
diff --git a/cad/felt/patches/patch-ab b/cad/felt/patches/patch-ab
index 3abbdd6f810..b8ae319b215 100644
--- a/cad/felt/patches/patch-ab
+++ b/cad/felt/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2001/08/23 04:26:52 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $
 
---- src/Velvet/Makefile.orig	Mon Feb 21 17:44:51 2000
+--- src/Velvet/Makefile.orig	2000-02-21 22:44:51.000000000 +0000
 +++ src/Velvet/Makefile
 @@ -18,7 +18,7 @@
  CFLAGS	= $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
@@ -11,9 +11,9 @@ $NetBSD: patch-ab,v 1.3 2001/08/23 04:26:52 jlam Exp $
  #	  /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
  #	  /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
  #	  /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
-@@ -40,4 +40,4 @@
+@@ -40,4 +40,4 @@ include $(TOPDIR)/etc/Makefile.bin
  
  velvet.o:	velvet.ad.h interface.h
  
 -install::;	@$(INSTALL) -m 0644 Velvet.ad $(X11DEF) 2> /dev/null || true
-+install::;	@$(INSTALL) -m 0644 Velvet.ad $(X11DEF)/Velvet 2> /dev/null || true
++install::;	@$(INSTALL) -m 0644 Velvet.ad $(DESTDIR)$(X11DEF)/Velvet 2> /dev/null || true
diff --git a/cad/felt/patches/patch-ac b/cad/felt/patches/patch-ac
index 217ffbdd913..30ed599d66f 100644
--- a/cad/felt/patches/patch-ac
+++ b/cad/felt/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2004/01/29 11:11:15 agc Exp $
+$NetBSD: patch-ac,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Patchwork/oogl.h	2004/01/29 10:29:34	1.1
-+++ src/Patchwork/oogl.h	2004/01/29 11:08:02
+--- src/Patchwork/oogl.h.orig	2000-02-21 22:44:31.000000000 +0000
++++ src/Patchwork/oogl.h
 @@ -2,370 +2,369 @@
  symbols.h
  **************************************************************************/
diff --git a/cad/felt/patches/patch-ad b/cad/felt/patches/patch-ad
index da54112285c..8761889fb48 100644
--- a/cad/felt/patches/patch-ad
+++ b/cad/felt/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2005/04/30 17:26:43 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- include/allocate.h.orig	Mon Feb 21 16:44:25 2000
+--- include/allocate.h.orig	2000-02-21 22:44:25.000000000 +0000
 +++ include/allocate.h
 @@ -25,7 +25,7 @@
  
diff --git a/cad/felt/patches/patch-ae b/cad/felt/patches/patch-ae
index 60cf4eb225b..e82d11a2bc7 100644
--- a/cad/felt/patches/patch-ae
+++ b/cad/felt/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/data.c.orig	2007-08-08 18:34:32.000000000 +0000
+--- lib/Matrix/data.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/data.c
 @@ -25,7 +25,7 @@
   ************************************************************************/
diff --git a/cad/felt/patches/patch-af b/cad/felt/patches/patch-af
index 2f3e8fdea6d..5fdf277b7f4 100644
--- a/cad/felt/patches/patch-af
+++ b/cad/felt/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-af,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/factor.c.orig	2007-08-08 18:36:55.000000000 +0000
+--- lib/Matrix/factor.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/factor.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-ag b/cad/felt/patches/patch-ag
index d7cf83e2668..c2ed2c88c23 100644
--- a/cad/felt/patches/patch-ag
+++ b/cad/felt/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/c_factor.c.orig	2007-08-08 18:40:32.000000000 +0000
+--- lib/Matrix/c_factor.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/c_factor.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-ah b/cad/felt/patches/patch-ah
index 155a5ffd3f2..d719ca0eac6 100644
--- a/cad/felt/patches/patch-ah
+++ b/cad/felt/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/c_data.c.orig	2007-08-08 18:37:42.000000000 +0000
+--- lib/Matrix/c_data.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/c_data.c
 @@ -25,7 +25,7 @@
   ************************************************************************/
diff --git a/cad/felt/patches/patch-ai b/cad/felt/patches/patch-ai
index 5f641496b51..d85e92091ce 100644
--- a/cad/felt/patches/patch-ai
+++ b/cad/felt/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/eigen.c.orig	2007-08-08 18:41:56.000000000 +0000
+--- lib/Matrix/eigen.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/eigen.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-aj b/cad/felt/patches/patch-aj
index 716686b7c38..2eb2ccc9d45 100644
--- a/cad/felt/patches/patch-aj
+++ b/cad/felt/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Widgets/xwd.c.orig	2007-08-08 18:42:55.000000000 +0000
+--- lib/Widgets/xwd.c.orig	2000-02-21 22:44:23.000000000 +0000
 +++ lib/Widgets/xwd.c
 @@ -24,7 +24,7 @@
  # include <X11/XWDFile.h>
diff --git a/cad/felt/patches/patch-ak b/cad/felt/patches/patch-ak
index bf9649283e4..93a3c75f70a 100644
--- a/cad/felt/patches/patch-ak
+++ b/cad/felt/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Burlap/allocate.h.orig	2007-08-08 18:55:52.000000000 +0000
+--- src/Burlap/allocate.h.orig	2000-02-21 22:44:29.000000000 +0000
 +++ src/Burlap/allocate.h
 @@ -28,7 +28,7 @@
  
diff --git a/cad/felt/patches/patch-al b/cad/felt/patches/patch-al
index 3893ad04cba..868e36c54d3 100644
--- a/cad/felt/patches/patch-al
+++ b/cad/felt/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2007/08/08 19:15:46 joerg Exp $
+$NetBSD: patch-al,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Burlap/interactive.c.orig	2007-08-08 18:49:34.000000000 +0000
+--- src/Burlap/interactive.c.orig	2000-02-21 22:44:30.000000000 +0000
 +++ src/Burlap/interactive.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-am b/cad/felt/patches/patch-am
index 037f2a0e1da..7d334cbf4b7 100644
--- a/cad/felt/patches/patch-am
+++ b/cad/felt/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2007/08/08 19:15:46 joerg Exp $
+$NetBSD: patch-am,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Patchwork/util.c.orig	2007-08-08 18:51:20.000000000 +0000
+--- src/Patchwork/util.c.orig	2000-02-21 22:44:31.000000000 +0000
 +++ src/Patchwork/util.c
 @@ -28,7 +28,7 @@
  # include <math.h>
diff --git a/cad/felt/patches/patch-an b/cad/felt/patches/patch-an
index e992972e0a7..9f564b9648c 100644
--- a/cad/felt/patches/patch-an
+++ b/cad/felt/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2007/08/08 19:15:46 joerg Exp $
+$NetBSD: patch-an,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Velvet/error.c.orig	2007-08-08 18:52:21.000000000 +0000
+--- src/Velvet/error.c.orig	2000-02-21 22:44:26.000000000 +0000
 +++ src/Velvet/error.c
 @@ -25,7 +25,7 @@
  
diff --git a/cad/felt/patches/patch-ao b/cad/felt/patches/patch-ao
index 2a32889223b..2fb5026cd44 100644
--- a/cad/felt/patches/patch-ao
+++ b/cad/felt/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2007/09/29 12:08:25 rillig Exp $
+$NetBSD: patch-ao,v 1.2 2009/12/17 20:31:37 abs Exp $
 
 Since gcc 4, type casts are no longer lvalues.
 
---- src/Burlap/descriptor.h.orig	2000-02-21 23:44:29.000000000 +0100
-+++ src/Burlap/descriptor.h	2007-09-29 14:04:42.000000000 +0200
+--- src/Burlap/descriptor.h.orig	2000-02-21 22:44:29.000000000 +0000
++++ src/Burlap/descriptor.h
 @@ -65,6 +65,7 @@
  
  # define D_NumTypes	(T_External + 1)
diff --git a/cad/felt/patches/patch-ap b/cad/felt/patches/patch-ap
index 5e7a90870a1..d0adf5fd9a4 100644
--- a/cad/felt/patches/patch-ap
+++ b/cad/felt/patches/patch-ap
@@ -1,9 +1,9 @@
-$NetBSD: patch-ap,v 1.1 2008/08/02 19:59:21 dholland Exp $
+$NetBSD: patch-ap,v 1.2 2009/12/17 20:31:37 abs Exp $
 
 Makes analysis.c consistent with Analysis.h.
 
---- src/Velvet/analysis.c~	2000-02-21 17:44:28.000000000 -0500
-+++ src/Velvet/analysis.c	2008-08-02 15:57:22.000000000 -0400
+--- src/Velvet/analysis.c.orig	2000-02-21 22:44:28.000000000 +0000
++++ src/Velvet/analysis.c
 @@ -964,7 +964,13 @@ static void ExternalCallback (w, client_
   ************************************************************************/
  
diff --git a/cad/felt/patches/patch-aq b/cad/felt/patches/patch-aq
new file mode 100644
index 00000000000..9be52376324
--- /dev/null
+++ b/cad/felt/patches/patch-aq
@@ -0,0 +1,16 @@
+$NetBSD: patch-aq,v 1.1 2009/12/17 20:31:37 abs Exp $
+
+--- etc/Makefile.orig	2000-03-05 01:43:26.000000000 +0000
++++ etc/Makefile
+@@ -29,9 +29,9 @@ clean::;
+ 
+ clobber::;
+ 
+-install::;	@$(MKDIR) $(DESTLIB)
++install::;	@$(MKDIR) $(DESTDIR)$(DESTLIB)
+ 		@for f in Defaults/*.defaults Translations/*.trn; do \
+-		$(INSTALL) -m 0644 $$f $(DESTLIB); done
++		$(INSTALL) -m 0644 $$f $(DESTDIR)$(DESTLIB); done
+ 
+ depend::;
+ 
diff --git a/cad/felt/patches/patch-ar b/cad/felt/patches/patch-ar
new file mode 100644
index 00000000000..afdf31c0990
--- /dev/null
+++ b/cad/felt/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1 2009/12/17 20:31:37 abs Exp $
+
+--- etc/Makefile.bin.orig	2000-02-21 22:44:50.000000000 +0000
++++ etc/Makefile.bin
+@@ -31,8 +31,8 @@ clean::;	@$(RM) $(OBJS) $(PROG) core
+ 
+ clobber::;	@$(RM) $(OBJS) $(PROG) $(SRCS) core tags
+ 
+-install::;	@$(MKDIR) $(DESTBIN)
+-		@$(INSTALL) -s -m 0755 $(PROG) $(DESTBIN)
++install::;	@$(MKDIR) $(DESTDIR)$(DESTBIN)
++		@$(INSTALL) -s -m 0755 $(PROG) $(DESTDIR)$(DESTBIN)
+ 
+ depend::;
+ 
diff --git a/cad/felt/patches/patch-as b/cad/felt/patches/patch-as
new file mode 100644
index 00000000000..3cd5da1ff79
--- /dev/null
+++ b/cad/felt/patches/patch-as
@@ -0,0 +1,16 @@
+$NetBSD: patch-as,v 1.1 2009/12/17 20:31:37 abs Exp $
+
+--- etc/Makefile.man.orig	2000-02-21 22:44:50.000000000 +0000
++++ etc/Makefile.man
+@@ -29,9 +29,9 @@ clean::;
+ 
+ clobber::;
+ 
+-install::;	@$(MKDIR) $(DESTMAN)/$(SECTION)
++install::;	@$(MKDIR) $(DESTDIR)$(DESTMAN)/$(SECTION)
+ 		@for f in $(MANS); do \
+-		$(INSTALL) -m 0644 $$f $(DESTMAN)/$(SECTION); done
++		$(INSTALL) -m 0644 $$f $(DESTDIR)$(DESTMAN)/$(SECTION); done
+ 
+ depend::;
+