summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorskrll <skrll>2002-08-10 13:59:33 +0000
committerskrll <skrll>2002-08-10 13:59:33 +0000
commitb553b293eb28416ff41d6841a2eb62c825ccde51 (patch)
treeaad5bd0902992f099453095bf8b90393515d0895 /databases
parent57ceaed70d7c85a81f8d76714206075f246825b0 (diff)
downloadpkgsrc-b553b293eb28416ff41d6841a2eb62c825ccde51.tar.gz
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>
Diffstat (limited to 'databases')
-rw-r--r--databases/rrdtool/Makefile14
-rw-r--r--databases/rrdtool/distinfo7
-rw-r--r--databases/rrdtool/patches/patch-ae13
-rw-r--r--databases/rrdtool/patches/patch-ah27
-rw-r--r--databases/rrdtool/patches/patch-ak19
5 files changed, 61 insertions, 19 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' }
);