Make a shared libcgi as rrdtool wants to link it into a DSO.

Rearrange several bits of the rrdtool build mechanism so that we're not
cheating quite as much. The end result is that rrdtool now compiles on
both ELF and a.out.

Closes pkg/14606 from Tim Preston <tim at flibble dot org>

4 files changed, 51 insertions, 34 deletions

diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile
index 6b4d320510d..9ab6af2fef9 100644
--- a/www/cgilib/Makefile
+++ b/www/cgilib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/05/05 17:40:26 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/10 13:59:33 skrll Exp $
 #
 
 DISTNAME=	cgilib-0.5
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.infodrom.north.de/pub/people/joey/cgilib/
 
@@ -9,6 +10,8 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://www.infodrom.north.de/cgilib/
 COMMENT=	Common gateway interface library
 
+USE_LIBTOOL=	yes
+
 USE_RMAN=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cgilib/PLIST b/www/cgilib/PLIST
index 5b67757e4b0..61e0095fa78 100644
--- a/www/cgilib/PLIST
+++ b/www/cgilib/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/10 13:59:33 skrll Exp $
 include/cgi.h
 lib/libcgi.a
+lib/libcgi.la
+lib/libcgi.so
+lib/libcgi.so.0
+lib/libcgi.so.0.0
 libexec/cgi-bin/cgitest
 libexec/cgi-bin/jumpto
 share/doc/html/cgilib/cgi.5.html
@@ -18,5 +22,5 @@ share/doc/html/cgilib/cgiSetHeader.3.html
 share/doc/html/cgilib/cgiSetType.3.html
 share/examples/cgilib/cgitest.c
 share/examples/cgilib/jumpto.c
-@dirrm share/doc/html/cgilib
 @dirrm share/examples/cgilib
+@dirrm share/doc/html/cgilib
diff --git a/www/cgilib/distinfo b/www/cgilib/distinfo
index 2a66096d521..34740981c59 100644
--- a/www/cgilib/distinfo
+++ b/www/cgilib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/09/10 21:36:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/08/10 13:59:33 skrll Exp $
 
 SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
 Size (cgilib-0.5.tar.gz) = 13991 bytes
 SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef
-SHA1 (patch-ab) = 3f463bee9f814e4bd77cca36c28ccb9b3844ff8a
+SHA1 (patch-ab) = 88d77ac0d8604deefc1213ff14ba13988af2ab4a
 SHA1 (patch-ac) = 0f3929094024de5357d97b00abb9bd12cdd2fbc8
 SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d
diff --git a/www/cgilib/patches/patch-ab b/www/cgilib/patches/patch-ab
index 0d60970242e..3fd02159f61 100644
--- a/www/cgilib/patches/patch-ab
+++ b/www/cgilib/patches/patch-ab
@@ -1,57 +1,67 @@
-$NetBSD: patch-ab,v 1.5 2001/09/10 21:36:20 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.6 2002/08/10 13:59:34 skrll Exp $
 
---- Makefile.orig	Fri Aug 20 17:14:07 1999
-+++ Makefile	Mon Sep 10 15:46:59 2001
-@@ -15,5 +15,5 @@
+--- Makefile.orig	Fri Aug 20 22:14:07 1999
++++ Makefile
+@@ -14,30 +14,48 @@
+ #   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
 +CFLAGS += -I. -Wall -O2
  LDFLAGS = -L.
- LIBS = -lcgi
-@@ -21,23 +21,34 @@
+-LIBS = -lcgi
++LIBS = libcgi.la
+ 
  OBJS = cgi.o cookies.o
  
-+all:: libcgi.a cgitest jumpto htmlman
-+
- libcgi.a: $(OBJS)
+-libcgi.a: $(OBJS)
 -	ar rc $@ $^
-+	ar ruv $@ $(OBJS)
++all: libcgi.la cgitest jumpto htmlman
  
- cgitest: cgitest.o libcgi.a
+-cgitest: cgitest.o libcgi.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ cgitest.o $(LIBS)
++.SUFFIXES:	.lo
  
- jumpto: jumpto.o libcgi.a
+-jumpto: jumpto.o libcgi.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ jumpto.o $(LIBS)
++.c.lo:
++	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -o $@ -c $<
  
 -all: libcgi.a cgitest jumpto
-+htmlman:
-+	for f in *.[35]; do \
-+	  nroff -mandoc $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
-+	done
++libcgi.la: $(OBJS:.o=.lo)
++	${LIBTOOL} --mode=link ${CC} -o $@ ${OBJS:.o=.lo} \
++		-rpath ${PREFIX}/lib \
++		-version-info 0:0
  
 -install: cgitest
 -	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:
+ 	for f in *.[35]; do \
+-	  man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
++	  nroff -mandoc $$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
-+	install -c -m 755 cgitest ${PREFIX}/libexec/cgi-bin
-+	install -c -m 755 jumpto ${PREFIX}/libexec/cgi-bin
-+	install -c -m 444 libcgi.a ${PREFIX}/lib
++	${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 ; \
 +        done
- 
- clean:
- 	rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
--
--htmlman:
--	for f in *.[35]; do \
--	  man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
--	done
++
++clean:
++	rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html