Sat May 21 05:56:08 2011 UTC ()
Add user-destdir installation support.


(obache)
diff -r1.31 -r1.32 pkgsrc/net/freewais-sf/Makefile
diff -r1.8 -r1.9 pkgsrc/net/freewais-sf/distinfo
diff -r1.2 -r1.3 pkgsrc/net/freewais-sf/patches/patch-ak
cvs diff -r1.31 -r1.32 pkgsrc/net/freewais-sf/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/freewais-sf/Attic/Makefile 2008/04/07 17:11:25 1.31
+++ pkgsrc/net/freewais-sf/Attic/Makefile 2011/05/21 05:56:08 1.32
@@ -1,42 +1,44 @@ @@ -1,42 +1,44 @@
1# $NetBSD: Makefile,v 1.31 2008/04/07 17:11:25 joerg Exp $ 1# $NetBSD: Makefile,v 1.32 2011/05/21 05:56:08 obache Exp $
2# 2#
3 3
4DISTNAME= freeWAIS-sf-2.2.12 4DISTNAME= freeWAIS-sf-2.2.12
5PKGNAME= freewais-sf-2.2.12 5PKGNAME= freewais-sf-2.2.12
6PKGREVISION= 6 6PKGREVISION= 6
7CATEGORIES= net databases 7CATEGORIES= net databases
8MASTER_SITES= ftp://ftp.informatik.uni-hamburg.de/pub/soft/infosystems/wais/freeWAIS/ 8MASTER_SITES= ftp://ftp.informatik.uni-hamburg.de/pub/soft/infosystems/wais/freeWAIS/
9 9
10MAINTAINER= bad@NetBSD.org 10MAINTAINER= bad@NetBSD.org
11HOMEPAGE= http://www.is.informatik.uni-duisburg.de/projects/freeWAIS-sf/ 11HOMEPAGE= http://www.is.informatik.uni-duisburg.de/projects/freeWAIS-sf/
12COMMENT= Enhanced Wide Area Information Server 12COMMENT= Enhanced Wide Area Information Server
13 13
14NOT_FOR_PLATFORM= Darwin-*-* 14NOT_FOR_PLATFORM= Darwin-*-*
15 15
 16PKG_DESTDIR_SUPPORT= user-destdir
 17
16USE_LIBTOOL= yes 18USE_LIBTOOL= yes
17USE_TOOLS+= makeinfo gzcat:run gzip:run perl:run 19USE_TOOLS+= makeinfo gzcat:run gzip:run perl:run
18 20
19HAS_CONFIGURE= yes 21HAS_CONFIGURE= yes
20CONFIGURE_ENV+= PREFIX=${PREFIX:Q} 22CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
21CONFIGURE_SCRIPT= ./Configure 23CONFIGURE_SCRIPT= ./Configure
22CONFIGURE_ARGS+= -sde -Dprefix=${PREFIX:Q} \ 24CONFIGURE_ARGS+= -sde -Dprefix=${DESTDIR}${PREFIX:Q} \
23 -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \ 25 -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
24 -Dmansrc=${PREFIX:Q}/${PKGMANDIR:Q}/man1 \ 26 -Dmansrc=${DESTDIR}${PREFIX:Q}/${PKGMANDIR:Q}/man1 \
25 -Dgzip=${TOOLS_PATH.gzip:Q} \ 27 -Dgzip=${TOOLS_PATH.gzip:Q} \
26 -Dzcat=${TOOLS_PATH.gzcat:Q} 28 -Dzcat=${TOOLS_PATH.gzcat:Q}
27CONFIGURE_ENV+= PERL5=${PERL5:Q} 29CONFIGURE_ENV+= PERL5=${PERL5:Q}
28INSTALL_TARGET= install install.man 30INSTALL_TARGET= install install.man
29INFO_FILES= # PLIST 31INFO_FILES= # PLIST
30 32
31INSTALLATION_DIRS= include ${PKGINFODIR} 33INSTALLATION_DIRS= bin lib include ${PKGINFODIR} ${PKGMANDIR}/man1
32 34
33post-build: 35post-build:
34 cd ${WRKSRC}/doc/SF && makeinfo fwsf.texi 36 cd ${WRKSRC}/doc/SF && makeinfo fwsf.texi
35 37
36post-install: 38post-install:
37 cd ${WRKSRC}/doc/SF; for f in fwsf.info fwsf.info-[0-9]*; do \ 39 cd ${WRKSRC}/doc/SF; for f in fwsf.info fwsf.info-[0-9]*; do \
38 ${TEST} ! -f "$$f" || \ 40 ${TEST} ! -f "$$f" || \
39 ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \ 41 ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
40 done 42 done
41 43
42.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/net/freewais-sf/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/freewais-sf/Attic/distinfo 2006/06/04 13:25:44 1.8
+++ pkgsrc/net/freewais-sf/Attic/distinfo 2011/05/21 05:56:08 1.9
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.8 2006/06/04 13:25:44 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2011/05/21 05:56:08 obache Exp $
2 2
3SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47 3SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47
4RMD160 (freeWAIS-sf-2.2.12.tar.gz) = 3b25c10f0cb62d69ce7001affe53c18bfaf9cede 4RMD160 (freeWAIS-sf-2.2.12.tar.gz) = 3b25c10f0cb62d69ce7001affe53c18bfaf9cede
5Size (freeWAIS-sf-2.2.12.tar.gz) = 1002974 bytes 5Size (freeWAIS-sf-2.2.12.tar.gz) = 1002974 bytes
6SHA1 (patch-aa) = 6368ee37ad5b7d3de487f72b2bffc5816c5f52ad 6SHA1 (patch-aa) = 6368ee37ad5b7d3de487f72b2bffc5816c5f52ad
7SHA1 (patch-ab) = e1e59cf668abe1ff7ec4c951ac50e38ceffaa0dd 7SHA1 (patch-ab) = e1e59cf668abe1ff7ec4c951ac50e38ceffaa0dd
8SHA1 (patch-ac) = 65736e07c191638cab4975f3cea398850e5158e9 8SHA1 (patch-ac) = 65736e07c191638cab4975f3cea398850e5158e9
9SHA1 (patch-ad) = 6302c42f5c0a0119e694fd0594dd5b24c77c2bc4 9SHA1 (patch-ad) = 6302c42f5c0a0119e694fd0594dd5b24c77c2bc4
10SHA1 (patch-ae) = f7321c900f520be4e0327f9425071513269202b7 10SHA1 (patch-ae) = f7321c900f520be4e0327f9425071513269202b7
11SHA1 (patch-af) = 9ddf23275a94f04745fd88fe4d800ae1e67404e4 11SHA1 (patch-af) = 9ddf23275a94f04745fd88fe4d800ae1e67404e4
12SHA1 (patch-ag) = 193641650a89d5f812271a410b60045198d9fe2f 12SHA1 (patch-ag) = 193641650a89d5f812271a410b60045198d9fe2f
13SHA1 (patch-ah) = 7e43f96b5c4a48b520e0c2e298daff0f144de9e6 13SHA1 (patch-ah) = 7e43f96b5c4a48b520e0c2e298daff0f144de9e6
14SHA1 (patch-ai) = eb6665a84950404b4afebbcb0885ec2e6916ea43 14SHA1 (patch-ai) = eb6665a84950404b4afebbcb0885ec2e6916ea43
15SHA1 (patch-aj) = 0df7a3712e0cde44887c6630bc362d5a3fa54381 15SHA1 (patch-aj) = 0df7a3712e0cde44887c6630bc362d5a3fa54381
16SHA1 (patch-ak) = 8b1172468823250d968e2159a55678c0336ae967 16SHA1 (patch-ak) = d6170775a677dba1fca88f89716c38abb3d58dc4
17SHA1 (patch-al) = 6b0e5274da7b04a81a90bd2fababaab5a245d1b3 17SHA1 (patch-al) = 6b0e5274da7b04a81a90bd2fababaab5a245d1b3
18SHA1 (patch-am) = 2a96b165e934df5d19e84ba7e1dfe77c6d0d1a1c 18SHA1 (patch-am) = 2a96b165e934df5d19e84ba7e1dfe77c6d0d1a1c
19SHA1 (patch-an) = 07b2928ecdb09a56009a0be2b0ab852f94aac412 19SHA1 (patch-an) = 07b2928ecdb09a56009a0be2b0ab852f94aac412
20SHA1 (patch-ao) = d1f6e8f75831ff534008a5d1c812c991e8fdb8e0 20SHA1 (patch-ao) = d1f6e8f75831ff534008a5d1c812c991e8fdb8e0
21SHA1 (patch-ap) = 7c254ad2a3e97ac95a168b8745b97390f562d596 21SHA1 (patch-ap) = 7c254ad2a3e97ac95a168b8745b97390f562d596
22SHA1 (patch-aq) = 41ecd67b8daba7dda4e6d20c1a728277a8d3bbf5 22SHA1 (patch-aq) = 41ecd67b8daba7dda4e6d20c1a728277a8d3bbf5
23SHA1 (patch-ar) = 66d24a2dbd028535e74dce08c6d976652dcbf9e3 23SHA1 (patch-ar) = 66d24a2dbd028535e74dce08c6d976652dcbf9e3
24SHA1 (patch-as) = 70ee188aa72478f81309851c1e4f45639e080bdb 24SHA1 (patch-as) = 70ee188aa72478f81309851c1e4f45639e080bdb
25SHA1 (patch-at) = dc5430973de6ad1f058e4a4a6287f878b6259e9c 25SHA1 (patch-at) = dc5430973de6ad1f058e4a4a6287f878b6259e9c
26SHA1 (patch-au) = 6a4a52426e0751e097cf272ba6d2390e4b0022f6 26SHA1 (patch-au) = 6a4a52426e0751e097cf272ba6d2390e4b0022f6
27SHA1 (patch-av) = 4466d5c1c6394a03dc953e8f138b749113664b65 27SHA1 (patch-av) = 4466d5c1c6394a03dc953e8f138b749113664b65
28SHA1 (patch-aw) = 00f267dd288dfcce627dbbb631cd388eae1a81af 28SHA1 (patch-aw) = 00f267dd288dfcce627dbbb631cd388eae1a81af
29SHA1 (patch-ax) = 9934346f7d22c23d0682c316079bb4cdf01d77d7 29SHA1 (patch-ax) = 9934346f7d22c23d0682c316079bb4cdf01d77d7
cvs diff -r1.2 -r1.3 pkgsrc/net/freewais-sf/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/net/freewais-sf/patches/Attic/patch-ak 2004/03/09 11:24:04 1.2
+++ pkgsrc/net/freewais-sf/patches/Attic/patch-ak 2011/05/21 05:56:08 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ak,v 1.2 2004/03/09 11:24:04 seb Exp $ 1$NetBSD: patch-ak,v 1.3 2011/05/21 05:56:08 obache Exp $
2 2
3--- ui/Makefile.SH.orig 1999-04-16 09:59:47.000000000 +0000 3--- ui/Makefile.SH.orig 1999-04-16 09:59:47.000000000 +0000
4+++ ui/Makefile.SH 4+++ ui/Makefile.SH
5@@ -57,7 +57,7 @@ SED = $sed 5@@ -57,7 +57,7 @@ SED = $sed
6  6
7 CFLAGS = $ccflags $optimize -I\$(TOP)/lib/ir $mccflags $embed_cflags 7 CFLAGS = $ccflags $optimize -I\$(TOP)/lib/ir $mccflags $embed_cflags
8 DPFLAGS = -I\$(TOP)/lib/ir $mccflags $embed_cflags 8 DPFLAGS = -I\$(TOP)/lib/ir $mccflags $embed_cflags
9-LDFLAGS = -L\$(TOP)/lib -lwais $socketlib -lm $embed_ldopts 9-LDFLAGS = -L\$(TOP)/lib -lwais $socketlib -lm $embed_ldopts
10+LDFLAGS = ../lib/libwais.la $socketlib -lm $embed_ldopts 10+LDFLAGS = ../lib/libwais.la $socketlib -lm $embed_ldopts
11 BIN_EXP = $installbin 11 BIN_EXP = $installbin
12 PRIVLIB = $installprivlib 12 PRIVLIB = $installprivlib
13 USRINC = $usrinc 13 USRINC = $usrinc
14@@ -112,10 +112,10 @@ local_realclean:: 14@@ -112,10 +112,10 @@ local_realclean::
@@ -48,25 +48,25 @@ $NetBSD: patch-ak,v 1.2 2004/03/09 11:24 @@ -48,25 +48,25 @@ $NetBSD: patch-ak,v 1.2 2004/03/09 11:24
48- $(INSTALL) -c -s -m 555 swais $(BIN_EXP) 48- $(INSTALL) -c -s -m 555 swais $(BIN_EXP)
49+ $(LIBTOOL) --mode=install $(INSTALL) -c -s -m 555 swais $(BIN_EXP) 49+ $(LIBTOOL) --mode=install $(INSTALL) -c -s -m 555 swais $(BIN_EXP)
50  50
51 deinstall:: 51 deinstall::
52 $(RM) $(BIN_EXP)/swais 52 $(RM) $(BIN_EXP)/swais
53@@ -180,16 +180,13 @@ wais.el: wais.el.raw 53@@ -180,16 +180,13 @@ wais.el: wais.el.raw
54 $(SED) -e 's:INSTALLROOT:"$(BIN_EXP)/":g' < wais.el.raw > wais.el; 54 $(SED) -e 's:INSTALLROOT:"$(BIN_EXP)/":g' < wais.el.raw > wais.el;
55  55
56 install:: 56 install::
57- @for dir in $(PRIVLIB)/emacs $(PRIVLIB)/emacs/lisp; do \ 57- @for dir in $(PRIVLIB)/emacs $(PRIVLIB)/emacs/lisp; do \
58- case '${MFLAGS}' in *[i]*) set +e;; esac; \ 58- case '${MFLAGS}' in *[i]*) set +e;; esac; \
59- (set -x; test -d $$dir || $(INSTALLDIR) $$dir); \ 59- (set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
60- done 60- done
61+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/emacs/site-lisp 61+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
62  62
63 install:: wais.el 63 install:: wais.el
64- $(INSTALL) -c -m 444 wais.el $(PRIVLIB)/emacs/lisp 64- $(INSTALL) -c -m 444 wais.el $(PRIVLIB)/emacs/lisp
65+ $(BSD_INSTALL_DATA) wais.el $(PREFIX)/share/emacs/site-lisp 65+ $(BSD_INSTALL_DATA) wais.el $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
66  66
67 deinstall:: 67 deinstall::
68- $(RM) $(PRIVLIB)/emacs/lisp/wais.el 68- $(RM) $(PRIVLIB)/emacs/lisp/wais.el
69+ $(RM) $(PREFIX)/share/emacs/site-lisp/wais.el 69+ $(RM) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp/wais.el
70  70
71 local_realclean:: 71 local_realclean::
72 $(RM) wais.el 72 $(RM) wais.el