Mon Feb 16 19:16:57 2009 UTC ()
DESTDIR support


(joerg)
diff -r1.15 -r1.16 pkgsrc/www/cgilib/Makefile
diff -r1.11 -r1.12 pkgsrc/www/cgilib/distinfo
diff -r1.9 -r1.10 pkgsrc/www/cgilib/patches/patch-ab
cvs diff -r1.15 -r1.16 pkgsrc/www/cgilib/Makefile (expand / switch to unified diff)

--- pkgsrc/www/cgilib/Makefile 2007/07/09 21:51:30 1.15
+++ pkgsrc/www/cgilib/Makefile 2009/02/16 19:16:57 1.16
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.15 2007/07/09 21:51:30 minskim Exp $ 1# $NetBSD: Makefile,v 1.16 2009/02/16 19:16:57 joerg Exp $
2# 2#
3 3
4DISTNAME= cgilib-0.5 4DISTNAME= cgilib-0.5
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.infodrom.org/projects/cgilib/download/ 7MASTER_SITES= http://www.infodrom.org/projects/cgilib/download/
8 8
9MAINTAINER= wulf@ping.net.au 9MAINTAINER= wulf@ping.net.au
10HOMEPAGE= http://www.infodrom.org/projects/cgilib/ 10HOMEPAGE= http://www.infodrom.org/projects/cgilib/
11COMMENT= Common gateway interface library 11COMMENT= Common gateway interface library
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 15INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 ${PKGMANDIR}/man5
14USE_LIBTOOL= yes 16USE_LIBTOOL= yes
15MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} 17MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
16 18
17.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/www/cgilib/distinfo (expand / switch to unified diff)

--- pkgsrc/www/cgilib/distinfo 2006/11/12 01:51:52 1.11
+++ pkgsrc/www/cgilib/distinfo 2009/02/16 19:16:57 1.12
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.11 2006/11/12 01:51:52 rillig Exp $ 1$NetBSD: distinfo,v 1.12 2009/02/16 19:16:57 joerg Exp $
2 2
3SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df 3SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
4RMD160 (cgilib-0.5.tar.gz) = 0188fc57aee277e772e32328b96aa836557c0c63 4RMD160 (cgilib-0.5.tar.gz) = 0188fc57aee277e772e32328b96aa836557c0c63
5Size (cgilib-0.5.tar.gz) = 13991 bytes 5Size (cgilib-0.5.tar.gz) = 13991 bytes
6SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef 6SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef
7SHA1 (patch-ab) = 6b19c14f162f27171d3edc631baae610090c1baa 7SHA1 (patch-ab) = 4e38d2665e14d3271c3ac296f3853c2a100c7617
8SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728 8SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728
9SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d 9SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d
cvs diff -r1.9 -r1.10 pkgsrc/www/cgilib/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/cgilib/patches/Attic/patch-ab 2006/11/12 01:51:52 1.9
+++ pkgsrc/www/cgilib/patches/Attic/patch-ab 2009/02/16 19:16:57 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.9 2006/11/12 01:51:52 rillig Exp $ 1$NetBSD: patch-ab,v 1.10 2009/02/16 19:16:57 joerg Exp $
2 2
3--- Makefile.orig 1999-08-20 23:14:07.000000000 +0200 3--- Makefile.orig 1999-08-20 23:14:07.000000000 +0200
4+++ Makefile 2006-11-12 02:49:34.000000000 +0100 4+++ Makefile 2006-11-12 02:49:34.000000000 +0100
5@@ -14,25 +14,31 @@ 5@@ -14,25 +14,31 @@
6 # along with this program; if not, write to the Free Software 6 # along with this program; if not, write to the Free Software
7 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 7 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
8  8
9-CFLAGS = -I. -Wall -O2 -g 9-CFLAGS = -I. -Wall -O2 -g
10+MANDIR?= ${PREFIX}/man 10+MANDIR?= ${PREFIX}/man
11+ 11+
12+CFLAGS += -I. -Wall -O2 12+CFLAGS += -I. -Wall -O2
13 LDFLAGS = -L. 13 LDFLAGS = -L.
14-LIBS = -lcgi 14-LIBS = -lcgi
@@ -41,27 +41,27 @@ $NetBSD: patch-ab,v 1.9 2006/11/12 01:51 @@ -41,27 +41,27 @@ $NetBSD: patch-ab,v 1.9 2006/11/12 01:51
41-install: cgitest 41-install: cgitest
42- install -m 755 cgitest /usr/lib/cgi-bin 42- install -m 755 cgitest /usr/lib/cgi-bin
43+jumpto: jumpto.lo libcgi.la 43+jumpto: jumpto.lo libcgi.la
44+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ jumpto.lo $(LIBS) 44+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ jumpto.lo $(LIBS)
45  45
46 clean: 46 clean:
47 rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html 47 rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
48@@ -41,3 +47,19 @@ htmlman: 48@@ -41,3 +47,19 @@ htmlman:
49 for f in *.[35]; do \ 49 for f in *.[35]; do \
50 man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \ 50 man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
51 done 51 done
52+ 52+
53+install: 53+install:
54+ ${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin 54+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/cgi-bin
55+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/cgilib 55+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/cgilib
56+ ${BSD_INSTALL_DATA} cgitest.c ${PREFIX}/share/examples/cgilib 56+ ${BSD_INSTALL_DATA} cgitest.c ${DESTDIR}${PREFIX}/share/examples/cgilib
57+ ${BSD_INSTALL_DATA} jumpto.c ${PREFIX}/share/examples/cgilib 57+ ${BSD_INSTALL_DATA} jumpto.c ${DESTDIR}${PREFIX}/share/examples/cgilib
58+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgi.la ${PREFIX}/lib 58+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgi.la ${DESTDIR}${PREFIX}/lib
59+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgitest ${PREFIX}/libexec/cgi-bin 59+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgitest ${DESTDIR}${PREFIX}/libexec/cgi-bin
60+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${PREFIX}/libexec/cgi-bin 60+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${DESTDIR}${PREFIX}/libexec/cgi-bin
61+ ${BSD_INSTALL_DATA} cgi.h ${PREFIX}/include 61+ ${BSD_INSTALL_DATA} cgi.h ${DESTDIR}${PREFIX}/include
62+ for i in *.3; do \ 62+ for i in *.3; do \
63+ ${BSD_INSTALL_MAN} $$i ${MANDIR}/man3/; \ 63+ ${BSD_INSTALL_MAN} $$i ${DESTDIR}${MANDIR}/man3/; \
64+ done 64+ done
65+ for i in *.5; do \ 65+ for i in *.5; do \
66+ ${BSD_INSTALL_MAN} $$i ${MANDIR}/man5/; \ 66+ ${BSD_INSTALL_MAN} $$i ${DESTDIR}${MANDIR}/man5/; \
67+ done 67+ done