summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/cgilib/Makefile11
-rw-r--r--www/cgilib/PLIST29
-rw-r--r--www/cgilib/distinfo4
-rw-r--r--www/cgilib/patches/patch-ab48
4 files changed, 40 insertions, 52 deletions
diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile
index 2c0a2471909..a420167030c 100644
--- a/www/cgilib/Makefile
+++ b/www/cgilib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/03/14 20:41:19 tv Exp $
#
DISTNAME= cgilib-0.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ftp://ftp.infodrom.north.de/pub/people/joey/cgilib/
@@ -12,12 +12,5 @@ COMMENT= Common gateway interface library
USE_BUILDLINK3= yes
USE_LIBTOOL= yes
-USE_RMAN= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "SunOS")
-MAKE_FLAGS+= NROFF="man -l"
-.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/www/cgilib/PLIST b/www/cgilib/PLIST
index 7f28e77750b..bdf5a8118b3 100644
--- a/www/cgilib/PLIST
+++ b/www/cgilib/PLIST
@@ -1,22 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/14 20:41:19 tv Exp $
include/cgi.h
lib/libcgi.la
libexec/cgi-bin/cgitest
libexec/cgi-bin/jumpto
-share/doc/html/cgilib/cgi.5.html
-share/doc/html/cgilib/cgiDebug.3.html
-share/doc/html/cgilib/cgiFree.3.html
-share/doc/html/cgilib/cgiFreeList.3.html
-share/doc/html/cgilib/cgiGetCookie.3.html
-share/doc/html/cgilib/cgiGetCookies.3.html
-share/doc/html/cgilib/cgiGetValue.3.html
-share/doc/html/cgilib/cgiGetVariables.3.html
-share/doc/html/cgilib/cgiHeader.3.html
-share/doc/html/cgilib/cgiInit.3.html
-share/doc/html/cgilib/cgiRedirect.3.html
-share/doc/html/cgilib/cgiSetHeader.3.html
-share/doc/html/cgilib/cgiSetType.3.html
+man/man3/cgiDebug.3
+man/man3/cgiFree.3
+man/man3/cgiFreeList.3
+man/man3/cgiGetCookie.3
+man/man3/cgiGetCookies.3
+man/man3/cgiGetValue.3
+man/man3/cgiGetVariables.3
+man/man3/cgiHeader.3
+man/man3/cgiInit.3
+man/man3/cgiRedirect.3
+man/man3/cgiSetHeader.3
+man/man3/cgiSetType.3
+man/man5/cgi.5
share/examples/cgilib/cgitest.c
share/examples/cgilib/jumpto.c
@dirrm share/examples/cgilib
-@dirrm share/doc/html/cgilib
diff --git a/www/cgilib/distinfo b/www/cgilib/distinfo
index 99d716616bd..212878fd5a0 100644
--- a/www/cgilib/distinfo
+++ b/www/cgilib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 14:08:29 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/14 20:41:19 tv Exp $
SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
RMD160 (cgilib-0.5.tar.gz) = 0188fc57aee277e772e32328b96aa836557c0c63
Size (cgilib-0.5.tar.gz) = 13991 bytes
SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef
-SHA1 (patch-ab) = ee15b5f4afd45725e58209f7a0560cfefd22d5a6
+SHA1 (patch-ab) = dcbf7b2a1253edfae1632c926d9388e79039a6ca
SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728
SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d
diff --git a/www/cgilib/patches/patch-ab b/www/cgilib/patches/patch-ab
index 418f71a8850..9074fb9c63b 100644
--- a/www/cgilib/patches/patch-ab
+++ b/www/cgilib/patches/patch-ab
@@ -1,14 +1,12 @@
-$NetBSD: patch-ab,v 1.7 2002/12/27 14:36:02 cjep Exp $
+$NetBSD: patch-ab,v 1.8 2005/03/14 20:41:19 tv Exp $
---- Makefile.orig Fri Aug 20 22:14:07 1999
+--- Makefile.orig 1999-08-20 17:14:07.000000000 -0400
+++ Makefile
-@@ -14,30 +14,50 @@
+@@ -14,25 +14,29 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
-CFLAGS = -I. -Wall -O2 -g
-+NROFF= nroff -mandoc
-+
+CFLAGS += -I. -Wall -O2
LDFLAGS = -L.
-LIBS = -lcgi
@@ -18,7 +16,7 @@ $NetBSD: patch-ab,v 1.7 2002/12/27 14:36:02 cjep Exp $
-libcgi.a: $(OBJS)
- ar rc $@ $^
-+all: libcgi.la cgitest jumpto htmlman
++all: libcgi.la cgitest jumpto
-cgitest: cgitest.o libcgi.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -39,31 +37,29 @@ $NetBSD: patch-ab,v 1.7 2002/12/27 14:36:02 cjep Exp $
- install -m 755 cgitest /usr/lib/cgi-bin
+cgitest: cgitest.lo libcgi.la
+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ cgitest.lo $(LIBS)
-
--clean:
-- rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
++
+jumpto: jumpto.lo libcgi.la
+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ jumpto.lo $(LIBS)
- htmlman:
+ clean:
+ rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
+@@ -41,3 +45,19 @@ htmlman:
for f in *.[35]; do \
-- man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
-+ ${NROFF} $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
+ man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
done
+
+install:
-+ -mkdir -p ${PREFIX}/libexec/cgi-bin
-+ -mkdir -p ${PREFIX}/share/examples/cgilib
-+ ${INSTALL} -c -m 444 cgitest.c ${PREFIX}/share/examples/cgilib
-+ ${INSTALL} -c -m 444 jumpto.c ${PREFIX}/share/examples/cgilib
-+ ${LIBTOOL} --mode=install ${INSTALL} -c -m 444 libcgi.la ${PREFIX}/lib
-+ ${LIBTOOL} --mode=install ${INSTALL} -c -m 755 cgitest ${PREFIX}/libexec/cgi-bin
-+ ${LIBTOOL} --mode=install ${INSTALL} -c -m 755 jumpto ${PREFIX}/libexec/cgi-bin
-+ ${INSTALL} -c -m 444 cgi.h ${PREFIX}/include
-+ -mkdir -p ${PREFIX}/share/doc/html/cgilib
-+ for i in *.html; do \
-+ ${INSTALL} -c -m 444 $$i ${PREFIX}/share/doc/html/cgilib ; \
++ ${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin
++ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/cgilib
++ ${BSD_INSTALL_DATA} cgitest.c ${PREFIX}/share/examples/cgilib
++ ${BSD_INSTALL_DATA} jumpto.c ${PREFIX}/share/examples/cgilib
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgi.la ${PREFIX}/lib
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgitest ${PREFIX}/libexec/cgi-bin
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${PREFIX}/libexec/cgi-bin
++ ${BSD_INSTALL_DATA} cgi.h ${PREFIX}/include
++ for i in *.3; do \
++ ${BSD_INSTALL_MAN} $$i ${PREFIX}/man/man3/; \
++ done
++ for i in *.5; do \
++ ${BSD_INSTALL_MAN} $$i ${PREFIX}/man/man5/; \
+ done
-+
-+clean:
-+ rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html