Fix broken destdirization. (hi joerg)

For some reason the "Checking for work-directory references" test
didn't catch the fact that ${DESTDIR}${LIBDIR} was being compiled
into the main binary as its library search path.

Noted by moof.

PKGREVISION -> 7

5 files changed, 149 insertions, 21 deletions

diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 42a8c9c466e..03da77eac8b 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2011/05/25 12:01:51 mspo Exp $
+# $NetBSD: Makefile,v 1.28 2011/08/18 05:03:10 dholland Exp $
 
 DISTNAME=	tf-40s1
 PKGNAME=	tf-4.0s1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net games
 MASTER_SITES=	ftp://laurel.actlab.utexas.edu/pub/tinyfugue/ \
 		${MASTER_SITE_SOURCEFORGE:=tinyfugue/}
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 MAKE_FILE=	${WRKSRC}/unix/Makefile
-MAKE_ENV+=	TFVER=${DISTNAME:S/^tf-//:Q}
+MAKE_ENV+=	TFVER=${DISTNAME:S/^tf-//}
 
 PATCH_SITES=	http://discworld.imaginary.com/external/taffyd/
 PATCHFILES=	tf-40s1-mccp-patch.gz
@@ -24,11 +24,11 @@ PATCH_DIST_STRIP=-p1
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-SUBST_CLASSES+=         fix-paths
-SUBST_MESSAGE.fix-paths=      late-addition DESTDIR
-SUBST_STAGE.fix-paths=        pre-configure
-SUBST_FILES.fix-paths=        unix/Config
-SUBST_SED.fix-paths=          -e 's,@DESTDIR@,'${DESTDIR}',g'
+SUBST_CLASSES+=			fix-paths
+SUBST_MESSAGE.fix-paths=	late-addition DESTDIR
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_FILES.fix-paths=		unix/Config
+SUBST_SED.fix-paths=		-e 's,@DESTDIR@,'${DESTDIR}',g'
 
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/net/tinyfugue/distinfo b/net/tinyfugue/distinfo
index c05a4ca979f..a26cf790956 100644
--- a/net/tinyfugue/distinfo
+++ b/net/tinyfugue/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/05/25 12:01:51 mspo Exp $
+$NetBSD: distinfo,v 1.13 2011/08/18 05:03:10 dholland Exp $
 
 SHA1 (tf-40s1-mccp-patch.gz) = 9a8d12ef8a6e0b6c315e6ae83efcbd179a930a6a
 RMD160 (tf-40s1-mccp-patch.gz) = af0d27a8b3585c8cc61669c79f26a8382c272424
@@ -7,6 +7,7 @@ SHA1 (tf-40s1.tar.gz) = 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746
 RMD160 (tf-40s1.tar.gz) = 2852daa3363bb134f29cc25d3177e9599ecacc1f
 Size (tf-40s1.tar.gz) = 349239 bytes
 SHA1 (patch-aa) = 8e6d68c7017ab4f4294451bd0d808f48e413f9b6
-SHA1 (patch-ab) = 48d01920a23392c74b37c2adcf9c2f36ae9e4094
-SHA1 (patch-ac) = d56d5c80e922a99a5f9bf62e2898309ec9ed0dc0
+SHA1 (patch-ab) = 7716f7cb3bd352824ff77e8f678416561e68bacf
+SHA1 (patch-ac) = d6cba3c8b7ce7e43759983d70cefd2358ad919a0
 SHA1 (patch-ad) = 4ff9f85b0b05857560b00e354496a9ed2a01e6e2
+SHA1 (patch-ae) = 2de940a57de9d12b0f24e0833bece04273329bac
diff --git a/net/tinyfugue/patches/patch-ab b/net/tinyfugue/patches/patch-ab
index 5ea956b7d67..b062eeee918 100644
--- a/net/tinyfugue/patches/patch-ab
+++ b/net/tinyfugue/patches/patch-ab
@@ -1,32 +1,38 @@
-$NetBSD: patch-ab,v 1.8 2011/05/25 12:01:51 mspo Exp $
+$NetBSD: patch-ab,v 1.9 2011/08/18 05:03:10 dholland Exp $
+
+Config for pkgsrc.
+DESTDIR support.
+Make the SYMLINK relative.
 
 --- unix/Config.orig	1999-03-06 22:43:28.000000000 +0000
 +++ unix/Config
-@@ -33,9 +33,9 @@
+@@ -33,9 +33,11 @@
  #   even if an old version is currently in use.  You can remove
  #   the old version manually later when it is no longer in use.
  
 -# TF="/usr/local/bin/tf-${TFVER}"
 -# LIBDIR="/usr/local/lib/tf-${TFVER}-lib"
 -# SYMLINK="/usr/local/bin/tf"
-+TF="@DESTDIR@${PREFIX}/bin/tf-${TFVER}"
-+LIBDIR="@DESTDIR@${PREFIX}/lib/tf-${TFVER}-lib"
-+SYMLINK="@DESTDIR@${PREFIX}/bin/tf"
++DESTDIR="@DESTDIR@"
++TF="${PREFIX}/bin/tf-${TFVER}"
++LIBDIR="${PREFIX}/lib/tf-${TFVER}-lib"
++SYMLINK="${PREFIX}/bin/tf"
++SYMLINKTARGET="tf-${TFVER}"
  
  
  ### Manual Page.
-@@ -44,8 +44,8 @@
+@@ -44,8 +46,8 @@
  # uses nroff format; set MANTYPE=cat if your man uses pre-formatted
  # vt100 "catman" pages.  Default is "cat".
  
 -# MANTYPE="nroff"
 -# MANPAGE="/usr/local/man/man1/tf.1"
 +MANTYPE="nroff"
-+MANPAGE="@DESTDIR@${PREFIX}/${PKGMANDIR}/man1/tf.1"
++MANPAGE="${PREFIX}/${PKGMANDIR}/man1/tf.1"
  
  
  ### Flags.
-@@ -111,7 +111,8 @@ FLAGS=''
+@@ -111,7 +113,8 @@ FLAGS=''
  
  # CC=cc
  # CCFLAGS="-g"
diff --git a/net/tinyfugue/patches/patch-ac b/net/tinyfugue/patches/patch-ac
index b8fe92b27f8..f0566048c6c 100644
--- a/net/tinyfugue/patches/patch-ac
+++ b/net/tinyfugue/patches/patch-ac
@@ -1,6 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2007/12/27 11:43:51 obache Exp $
+$NetBSD: patch-ac,v 1.5 2011/08/18 05:03:10 dholland Exp $
 
---- unix/tfconfig.orig	2007-12-27 11:03:19.000000000 +0000
+Config for pkgsrc.
+DESTDIR support.
+Make the SYMLINK relative.
+
+--- unix/tfconfig.orig	2011-08-18 04:45:11.000000000 +0000
 +++ unix/tfconfig
 @@ -168,18 +168,18 @@ fi
  # The cd;pwd is needed to normalize the directory name in case of links, etc.
@@ -54,3 +58,14 @@ $NetBSD: patch-ac,v 1.4 2007/12/27 11:43:51 obache Exp $
  echo; echo
  
  rm -f ../src/Makefile ${AOUT}
+@@ -246,8 +246,10 @@ else
+ fi
+ 
+ echo "MAKE       = ${MAKE}" >&5
++echo "DESTDIR    = ${DESTDIR}" >&5
+ echo "TF         = ${TF}" >&5
+ echo "SYMLINK    = ${SYMLINK}" >&5
++echo "SYMLINKTARGET    = ${SYMLINKTARGET}" >&5
+ echo "LIBDIR     = ${LIBDIR}" >&5
+ echo "MAILDIR    = ${MAILDIR}" >&5
+ echo "MANPAGE    = ${MANPAGE}" >&5
diff --git a/net/tinyfugue/patches/patch-ae b/net/tinyfugue/patches/patch-ae
new file mode 100644
index 00000000000..658c9f86911
--- /dev/null
+++ b/net/tinyfugue/patches/patch-ae
@@ -0,0 +1,106 @@
+$NetBSD: patch-ae,v 1.1 2011/08/18 05:03:10 dholland Exp $
+
+DESTDIR support.
+
+--- unix/unix.mak~	1999-03-06 22:43:28.000000000 +0000
++++ unix/unix.mak
+@@ -19,7 +19,7 @@ SHELL      = /bin/sh
+ BUILDERS   = Makefile
+ 
+ 
+-install:  _failmsg _all $(TF) LIBRARY $(MANPAGE) $(SYMLINK)
++install:  _failmsg _all $(DESTDIR)$(TF) LIBRARY $(DESTDIR)$(MANPAGE) $(DESTDIR)$(SYMLINK)
+ 	@echo '#####################################################' > exitmsg
+ 	@echo '## TinyFugue installation successful.' >> exitmsg
+ 	@echo "## You can safely delete everything in `cd ..; pwd`". >> exitmsg
+@@ -64,43 +64,43 @@ TF tf$(X):     $(OBJS) $(BUILDERS)
+ #	@# ULTRIX's sh errors here if strip isn't found, despite "true".
+ 	-test -z "$(STRIP)" || $(STRIP) tf$(X) || true
+ 
+-install_TF $(TF): tf$(X) $(BUILDERS)
+-	-@rm -f $(TF)
+-	cp tf$(X) $(TF)
+-	chmod $(MODE) $(TF)
++install_TF $(DESTDIR)$(TF): tf$(X) $(BUILDERS)
++	-@rm -f $(DESTDIR)$(TF)
++	cp tf$(X) $(DESTDIR)$(TF)
++	chmod $(MODE) $(DESTDIR)$(TF)
+ 
+-SYMLINK $(SYMLINK): $(TF)
+-	test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); }
++SYMLINK $(DESTDIR)$(SYMLINK): $(DESTDIR)$(TF)
++	test -z "$(DESTDIR)$(SYMLINK)" || { rm -f $(DESTDIR)$(SYMLINK) && ln -s $(SYMLINKTARGET) $(DESTDIR)$(SYMLINK); }
+ 
+-LIBRARY $(LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx
++LIBRARY $(DESTDIR)$(LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx
+ 	@echo '## Creating library directory...'
+ #	@# Overly simplified shell commands, to avoid problems on ultrix
+-	-@test -n "$(LIBDIR)" || echo "LIBDIR is undefined.  Check unix/Config."
+-	test -n "$(LIBDIR)"
+-	test -d "$(LIBDIR)" || mkdir $(LIBDIR)
+-	-@test -d "$(LIBDIR)" || echo "Can't make $(LIBDIR) directory.  See if"
+-	-@test -d "$(LIBDIR)" || echo "there is already a file with that name."
+-	test -d "$(LIBDIR)"
++	-@test -n "$(DESTDIR)$(LIBDIR)" || echo "LIBDIR is undefined.  Check unix/Config."
++	test -n "$(DESTDIR)$(LIBDIR)"
++	test -d "$(DESTDIR)$(LIBDIR)" || mkdir $(DESTDIR)$(LIBDIR)
++	-@test -d "$(DESTDIR)$(LIBDIR)" || echo "Can't make $(DESTDIR)$(LIBDIR) directory.  See if"
++	-@test -d "$(DESTDIR)$(LIBDIR)" || echo "there is already a file with that name."
++	test -d "$(DESTDIR)$(LIBDIR)"
+ #
+-#	@#rm -f $(LIBDIR)/*;  # wrong: this would remove local.tf, etc.
++#	@#rm -f $(DESTDIR)$(LIBDIR)/*;  # wrong: this would remove local.tf, etc.
+ 	@echo '## Copying library files...'
+ 	cd ../tf-lib; \
+ 	for f in *; do test -f $$f && files="$$files $$f"; done; \
+-	( cd $(LIBDIR); rm -f $$files tf.help tf.help.index; ); \
+-	cp $$files $(LIBDIR); \
+-	cd $(LIBDIR); \
++	( cd $(DESTDIR)$(LIBDIR); rm -f $$files tf.help tf.help.index; ); \
++	cp $$files $(DESTDIR)$(LIBDIR); \
++	cd $(DESTDIR)$(LIBDIR); \
+ 	chmod $(MODE) $$files; chmod ugo-wx $$files
+-	-rm -f $(LIBDIR)/CHANGES 
+-	cp ../CHANGES $(LIBDIR)
+-	chmod $(MODE) $(LIBDIR)/CHANGES; chmod ugo-wx $(LIBDIR)/CHANGES
+-	chmod $(MODE) $(LIBDIR)
+-	-@cd $(LIBDIR); old=`ls replace.tf 2>/dev/null`; \
++	-rm -f $(DESTDIR)$(LIBDIR)/CHANGES 
++	cp ../CHANGES $(DESTDIR)$(LIBDIR)
++	chmod $(MODE) $(DESTDIR)$(LIBDIR)/CHANGES; chmod ugo-wx $(DESTDIR)$(LIBDIR)/CHANGES
++	chmod $(MODE) $(DESTDIR)$(LIBDIR)
++	-@cd $(DESTDIR)$(LIBDIR); old=`ls replace.tf 2>/dev/null`; \
+ 	if [ -n "$$old" ]; then \
+-	    echo "## WARNING: Obsolete files found in $(LIBDIR): $$old"; \
++	    echo "## WARNING: Obsolete files found in $(DESTDIR)$(LIBDIR): $$old"; \
+ 	fi
+ 	@echo '## Creating links so old library names still work...'
+ #	@# note: ln -sf isn't portable.
+-	@cd $(LIBDIR); \
++	@cd $(DESTDIR)$(LIBDIR); \
+ 	rm -f bind-bash.tf;    ln -s  kb-bash.tf   bind-bash.tf;    \
+ 	rm -f bind-emacs.tf;   ln -s  kb-emacs.tf  bind-emacs.tf;   \
+ 	rm -f completion.tf;   ln -s  complete.tf  completion.tf;   \
+@@ -126,10 +126,10 @@ __always__:
+ 	$(MAKE) -f ../unix/unix.mak CC='$(CC)' CFLAGS='$(FLAGS)' makehelp
+ 	./makehelp < ../tf-lib/tf-help > ../tf-lib/tf-help.idx
+ 
+-MANPAGE $(MANPAGE): $(BUILDERS) tf.1.$(MANTYPE)man
+-	cp tf.1.$(MANTYPE)man $(MANPAGE)
+-	chmod $(MODE) $(MANPAGE)
+-	chmod ugo-x $(MANPAGE)
++MANPAGE $(DESTDIR)$(MANPAGE): $(BUILDERS) tf.1.$(MANTYPE)man
++	cp tf.1.$(MANTYPE)man $(DESTDIR)$(MANPAGE)
++	chmod $(MODE) $(DESTDIR)$(MANPAGE)
++	chmod ugo-x $(DESTDIR)$(MANPAGE)
+ 
+ tf.1.catman:  tf.1.nroffman
+ 	TERM=vt100; nroff -man tf.1.nroffman > tf.1.catman
+@@ -142,6 +142,7 @@ Makefile: ../unix/Config ../unix/vars.ma
+ dist: tf.1.catman ../tf-lib/tf-help.idx
+ 
+ uninstall:
++	false
+ 	@echo "Remove $(LIBDIR) $(TF) $(MANPAGE)"
+ 	@echo "Is this okay? (y/n)"
+ 	@read response; test "$$response" = "y"