Add user-destdir installation support.

3 files changed, 13 insertions, 11 deletions

diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 248996efef8..67f58cd49b2 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/04/07 17:11:25 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2011/05/21 05:56:08 obache Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
@@ -13,22 +13,24 @@ COMMENT=	Enhanced Wide Area Information Server
 
 NOT_FOR_PLATFORM=	Darwin-*-*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=	yes
 USE_TOOLS+=	makeinfo gzcat:run gzip:run perl:run
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX:Q}			\
+CONFIGURE_ARGS+=	-sde -Dprefix=${DESTDIR}${PREFIX:Q}		\
 			-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS}	\
-			-Dmansrc=${PREFIX:Q}/${PKGMANDIR:Q}/man1	\
+			-Dmansrc=${DESTDIR}${PREFIX:Q}/${PKGMANDIR:Q}/man1	\
 			-Dgzip=${TOOLS_PATH.gzip:Q}			\
 			-Dzcat=${TOOLS_PATH.gzcat:Q}
 CONFIGURE_ENV+=		PERL5=${PERL5:Q}
 INSTALL_TARGET=		install install.man
 INFO_FILES=		# PLIST
 
-INSTALLATION_DIRS=	include ${PKGINFODIR}
+INSTALLATION_DIRS=	bin lib include ${PKGINFODIR} ${PKGMANDIR}/man1
 
 post-build:
 	cd ${WRKSRC}/doc/SF && makeinfo fwsf.texi
@@ -36,7 +38,7 @@ post-build:
 post-install:
 	cd ${WRKSRC}/doc/SF; for f in fwsf.info fwsf.info-[0-9]*; do	\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/freewais-sf/distinfo b/net/freewais-sf/distinfo
index 23f07eb84f6..c64aff7d5ba 100644
--- a/net/freewais-sf/distinfo
+++ b/net/freewais-sf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/06/04 13:25:44 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/05/21 05:56:08 obache Exp $
 
 SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47
 RMD160 (freeWAIS-sf-2.2.12.tar.gz) = 3b25c10f0cb62d69ce7001affe53c18bfaf9cede
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 193641650a89d5f812271a410b60045198d9fe2f
 SHA1 (patch-ah) = 7e43f96b5c4a48b520e0c2e298daff0f144de9e6
 SHA1 (patch-ai) = eb6665a84950404b4afebbcb0885ec2e6916ea43
 SHA1 (patch-aj) = 0df7a3712e0cde44887c6630bc362d5a3fa54381
-SHA1 (patch-ak) = 8b1172468823250d968e2159a55678c0336ae967
+SHA1 (patch-ak) = d6170775a677dba1fca88f89716c38abb3d58dc4
 SHA1 (patch-al) = 6b0e5274da7b04a81a90bd2fababaab5a245d1b3
 SHA1 (patch-am) = 2a96b165e934df5d19e84ba7e1dfe77c6d0d1a1c
 SHA1 (patch-an) = 07b2928ecdb09a56009a0be2b0ab852f94aac412
diff --git a/net/freewais-sf/patches/patch-ak b/net/freewais-sf/patches/patch-ak
index b81d5e6b979..dc097b4ca57 100644
--- a/net/freewais-sf/patches/patch-ak
+++ b/net/freewais-sf/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2004/03/09 11:24:04 seb Exp $
+$NetBSD: patch-ak,v 1.3 2011/05/21 05:56:08 obache Exp $
 
 --- ui/Makefile.SH.orig	1999-04-16 09:59:47.000000000 +0000
 +++ ui/Makefile.SH
@@ -58,15 +58,15 @@ $NetBSD: patch-ak,v 1.2 2004/03/09 11:24:04 seb Exp $
 -	case '${MFLAGS}' in *[i]*) set +e;; esac; \
 -	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
 -	done
-+	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/emacs/site-lisp
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
  
  install:: wais.el
 -	$(INSTALL) -c -m 444 wais.el  $(PRIVLIB)/emacs/lisp
-+	$(BSD_INSTALL_DATA) wais.el  $(PREFIX)/share/emacs/site-lisp
++	$(BSD_INSTALL_DATA) wais.el  $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
  
  deinstall::
 -	$(RM)  $(PRIVLIB)/emacs/lisp/wais.el
-+	$(RM)  $(PREFIX)/share/emacs/site-lisp/wais.el
++	$(RM)  $(DESTDIR)$(PREFIX)/share/emacs/site-lisp/wais.el
  
  local_realclean::
  	$(RM) wais.el