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>

9 files changed, 112 insertions, 53 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 18aa233ab43..e2cf7bd4f92 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/07/31 17:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/10 13:59:34 skrll Exp $
 #
 
 DISTNAME=	rrdtool-1.0.33
@@ -10,7 +10,7 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool
 COMMENT=	Data analysis tool generating graphical representations
 
-DEPENDS+=	cgilib-0.5:../../www/cgilib
+DEPENDS+=	cgilib>=0.5nb1:../../www/cgilib
 DEPENDS+=	gd>=1.8.4nb1:../../graphics/gd
 DEPENDS+=	jpeg-6*:../../graphics/jpeg
 
@@ -36,6 +36,16 @@ USE_PERL5=		# defined
 PERL5_PACKLIST+= 	${PERL5_SITEARCH}/auto/RRDp/.packlist
 PERL5_PACKLIST+=	${PERL5_SITEARCH}/auto/RRDs/.packlist
 
+post-patch:
+	cd ${WRKSRC};							\
+        files="perl-shared/Makefile.PL";				\
+        for file in $${files}; do					\
+		${SED}	-e "s|@X11BASE@|${X11BASE}|"			\
+			-e "s|@LOCALBASE@|${LOCALBASE}|"		\
+			$${file} > $${file}.new;			\
+		${MV} -f $${file}.new $${file};				\
+	done
+
 # tcl build not enabled at this time.  If this is turned on, the
 # following files & directory would have to be added to PLIST:
 #
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 69d3c7ce468..a87101d39ca 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/31 17:04:08 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/08/10 13:59:34 skrll Exp $
 
 SHA1 (rrdtool-1.0.33.tar.gz) = d0394368ef30dcd390d466843ef4d052365f2470
 Size (rrdtool-1.0.33.tar.gz) = 1118040 bytes
@@ -6,11 +6,12 @@ SHA1 (patch-aa) = 0875a1a71f6577fefaf1bfd7aaf7058f6dd8ae5d
 SHA1 (patch-ab) = 978c96792b14e21302c5f97da8cf9c47701413ac
 SHA1 (patch-ac) = b57fc4a10ef8df50983a0ee5f1059c8b079c4d0f
 SHA1 (patch-ad) = c96aa5f833e5637fb6090fb3043a54111c0d99d8
+SHA1 (patch-ae) = 0b401636a76434431ee0a2e371be62021868aaed
 SHA1 (patch-ag) = 4949384f3431cd716c37bcf22e3c4b96f4c900fc
-SHA1 (patch-ah) = 2e8350196ab6eabf55a29c4bac65c0d72fa40836
+SHA1 (patch-ah) = fca2282a0f0fe9171dc713c62c61369f487cd76b
 SHA1 (patch-ai) = 90766fd4083f6697ca7406449628b26f7d051726
 SHA1 (patch-aj) = 35ed816678d0b6cf0aedfff0d09b9726db22d68f
-SHA1 (patch-ak) = 21fc4da20d97ecdb71c6009c9a1fff5fc580afcb
+SHA1 (patch-ak) = aaf3aeb4b9baf5954709aeca00a3f3a56a2bc2e1
 SHA1 (patch-al) = 7ac3e507d3d8950ed431c7a9cc3afd23d4462c07
 SHA1 (patch-am) = 048de065a9d3bdb7625df69c4c6807ea58522ba4
 SHA1 (patch-an) = 4dc1cf17f7d143a347de2bc141607e404064a03d
diff --git a/databases/rrdtool/patches/patch-ae b/databases/rrdtool/patches/patch-ae
new file mode 100644
index 00000000000..b97ffa056dd
--- /dev/null
+++ b/databases/rrdtool/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2002/08/10 13:59:34 skrll Exp $
+
+--- src/Makefile.am.orig	Mon Feb 19 11:05:56 2001
++++ src/Makefile.am
+@@ -64,7 +64,7 @@ librrd_la_LDFLAGS         = -version-inf
+ include_HEADERS	= rrd.h
+ 
+ librrd_private_la_LIBADD  = $(RRD_LIBS)
+-librrd_private_la_LDFLAGS = -static
++librrd_private_la_LDFLAGS = -prefer-pic
+ 
+ bin_PROGRAMS	= rrdcgi rrdtool rrdupdate
+ 
diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah
index 19a42412010..11d66384760 100644
--- a/databases/rrdtool/patches/patch-ah
+++ b/databases/rrdtool/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2001/09/24 13:10:48 wulf Exp $
+$NetBSD: patch-ah,v 1.7 2002/08/10 13:59:35 skrll Exp $
 
---- src/Makefile.in.orig	Thu Feb 22 12:07:34 2001
+--- src/Makefile.in.orig	Thu Feb 22 03:07:34 2001
 +++ src/Makefile.in
-@@ -87,12 +87,7 @@
+@@ -87,12 +87,7 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
  TROFF = @TROFF@
  VERSION = @VERSION@
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.6 2001/09/24 13:10:48 wulf Exp $
  
  #COMPILE   = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
  #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-@@ -108,7 +103,7 @@
+@@ -108,7 +103,7 @@ RRD_C_FILES =  	gdpng.c			getopt.c		geto
  # creates a ./.lib/*.al file that contains the PIC compiled object
  # files.
  
@@ -25,7 +25,16 @@ $NetBSD: patch-ah,v 1.6 2001/09/24 13:10:48 wulf Exp $
  
  
  lib_LTLIBRARIES = librrd.la
-@@ -146,18 +141,12 @@
+@@ -123,7 +118,7 @@ librrd_la_LDFLAGS = -version-info 0:0:0
+ include_HEADERS = rrd.h
+ 
+ librrd_private_la_LIBADD = $(RRD_LIBS)
+-librrd_private_la_LDFLAGS = -static
++librrd_private_la_LDFLAGS = -prefer-pic
+ 
+ bin_PROGRAMS = rrdcgi rrdtool rrdupdate
+ 
+@@ -146,18 +141,12 @@ LTLIBRARIES =  $(lib_LTLIBRARIES) $(noin
  DEFS = @DEFS@ -I. -I$(srcdir) -I../config
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -45,18 +54,18 @@ $NetBSD: patch-ah,v 1.6 2001/09/24 13:10:48 wulf Exp $
  librrd_private_la_OBJECTS =  gdpng.lo getopt.lo getopt1.lo gifsize.lo \
  parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
  rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
-@@ -279,8 +268,8 @@
+@@ -279,8 +268,8 @@ maintainer-clean-libtool:
  librrd.la: $(librrd_la_OBJECTS) $(librrd_la_DEPENDENCIES)
  	$(LINK) -rpath $(libdir) $(librrd_la_LDFLAGS) $(librrd_la_OBJECTS) $(librrd_la_LIBADD) $(LIBS)
  
 -librrd_private.la: $(librrd_private_la_OBJECTS) $(librrd_private_la_DEPENDENCIES)
 -	$(LINK)  $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
 +librrd_private.la: $(librrd_private_la_OBJECTS)
-+	$(LINK)  -rpath $(libdir) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
++	$(LINK) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
  
  mostlyclean-binPROGRAMS:
  
-@@ -307,7 +296,7 @@
+@@ -307,7 +296,7 @@ uninstall-binPROGRAMS:
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
  	done
  
@@ -65,7 +74,7 @@ $NetBSD: patch-ah,v 1.6 2001/09/24 13:10:48 wulf Exp $
  	@rm -f rrdcgi
  	$(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS)
  
-@@ -378,49 +367,6 @@
+@@ -378,49 +367,6 @@ distdir: $(DISTFILES)
  	    || cp -p $$d/$$file $(distdir)/$$file || :; \
  	  fi; \
  	done
diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak
index 090fff439f3..aa8172c3b1c 100644
--- a/databases/rrdtool/patches/patch-ak
+++ b/databases/rrdtool/patches/patch-ak
@@ -1,17 +1,26 @@
-$NetBSD: patch-ak,v 1.6 2001/09/25 12:18:02 wulf Exp $
+$NetBSD: patch-ak,v 1.7 2002/08/10 13:59:35 skrll Exp $
 
---- perl-shared/Makefile.PL.orig	Thu Jul 13 16:22:17 2000
+--- perl-shared/Makefile.PL.orig	Thu Jul 13 22:22:17 2000
 +++ perl-shared/Makefile.PL
-@@ -10,10 +10,10 @@
+@@ -4,16 +4,18 @@ use Config;
+ # the contents of the Makefile that is written.
+ 
+ # Specify the location of the archive containing PIC compiled object files.
++# This is a cheat.
+ my $librrd = "-L../src/.libs/ -lrrd_private"  ;
+ 
+ WriteMakefile(
      'NAME'         => 'RRDs',
      'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
      'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
 -    'INC'          => '-I../src -I../gd1.3',
 +    'INC'          => '-I../src -I${PREFIX}/include',
++    'LIBS'         => "-L@X11BASE@/lib -L@LOCALBASE@/lib -lcgi -lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl",
      # where to look for the necessary libraries 
      # Perl will figure out which one is valid
-     'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
+-    'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
 -    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-+    'dynamic_lib'  => {'OTHERLDFLAGS' => '-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib '."$librrd -lcgi -lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl"},
++    'depend'	   => {'RRDs.c' => "../src/librrd_private.la"},
++    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd"},
      'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
  );
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