[pkgsrc/trunk]: pkgsrc/www/cgilib This doesn't need nroff or rman, neither of...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/cgilib This doesn't need nroff or rman, neither of...
From: tv <tv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:29:13 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53dd53d95617
branches:  trunk
changeset: 490544:53dd53d95617
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Mar 14 20:41:19 2005 +0000

description:
This doesn't need nroff or rman, neither of which are present by default on
some systems.

Since the manpages are distributed as ... manpages, install them as
(...drum roll please...) manpages!

Also fix permissions by using BSD_INSTALL_* macros.

diffstat:

 www/cgilib/Makefile         |  11 +--------
 www/cgilib/PLIST            |  29 +++++++++++++--------------
 www/cgilib/distinfo         |   4 +-
 www/cgilib/patches/patch-ab |  48 ++++++++++++++++++++------------------------
 4 files changed, 40 insertions(+), 52 deletions(-)

diffs (162 lines):

diff -r 1dcba08c1c1c -r 53dd53d95617 www/cgilib/Makefile
--- a/www/cgilib/Makefile       Mon Mar 14 20:23:50 2005 +0000
+++ b/www/cgilib/Makefile       Mon Mar 14 20:41:19 2005 +0000
@@ -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 @@
 
 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 -r 1dcba08c1c1c -r 53dd53d95617 www/cgilib/PLIST
--- a/www/cgilib/PLIST  Mon Mar 14 20:23:50 2005 +0000
+++ b/www/cgilib/PLIST  Mon Mar 14 20:41:19 2005 +0000
@@ -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 -r 1dcba08c1c1c -r 53dd53d95617 www/cgilib/distinfo
--- a/www/cgilib/distinfo       Mon Mar 14 20:23:50 2005 +0000
+++ b/www/cgilib/distinfo       Mon Mar 14 20:41:19 2005 +0000
@@ -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 -r 1dcba08c1c1c -r 53dd53d95617 www/cgilib/patches/patch-ab
--- a/www/cgilib/patches/patch-ab       Mon Mar 14 20:23:50 2005 +0000
+++ b/www/cgilib/patches/patch-ab       Mon Mar 14 20:41:19 2005 +0000
@@ -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 @@
  
 -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 @@
 -      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
-+
-+clean:
-+      rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
++      for i in *.5; do \
++          ${BSD_INSTALL_MAN} $$i ${PREFIX}/man/man5/; \
++        done

Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/smtpfeed There's no need to manually format and i...
Next by Date: [pkgsrc/trunk]: pkgsrc/graphics/ploticus NROFF isn't used anywhere here, so d...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/smtpfeed There's no need to manually format and i...
Next by Thread: [pkgsrc/trunk]: pkgsrc/graphics/ploticus NROFF isn't used anywhere here, so d...
Indexes:

Home | Main Index | Thread Index | Old Index