cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix more breakage due to my recent gd update. sturm@ ok.

Browse Source
This commit is contained in:
fgsch 2005-10-24 05:11:01 +00:00
parent ab934bbefb
commit 0b7f165fec
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/rrdtool/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2005/10/22 17:18:53 bernd Exp $
# $OpenBSD: Makefile,v 1.33 2005/10/24 05:11:01 fgsch Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@ -6,7 +6,7 @@ COMMENT= "system to store and display time-series data"
RRDVERSION= 1.0.49
DISTNAME= rrdtool-${RRDVERSION}
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}pub/rrdtool-1.0.x/ \
http://ftp.sunet.se/pub/network/monitoring/rrdtool/rrdtool-1.0.x/
@ -20,7 +20,8 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xpm c freetype fontconfig jpeg m png ttf z
WANTLIB= c freetype fontconfig jpeg m png z
MODULES= converters/libiconv
@ -31,6 +32,8 @@ FLAVOR?=
LIB_DEPENDS= gd.18::graphics/gd
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static \
--enable-local-libpng \

4
net/rrdtool/patches/patch-perl-shared_Makefile_PL_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-perl-shared_Makefile_PL_in,v 1.3 2004/10/13 13:43:26 danh Exp $
$OpenBSD: patch-perl-shared_Makefile_PL_in,v 1.4 2005/10/24 05:11:01 fgsch Exp $
--- perl-shared/Makefile.PL.in.orig Wed Apr 7 17:04:53 2004
+++ perl-shared/Makefile.PL.in Wed Oct 13 09:24:47 2004
@@ -10,11 +10,11 @@ WriteMakefile(
@ -12,6 +12,6 @@ $OpenBSD: patch-perl-shared_Makefile_PL_in,v 1.3 2004/10/13 13:43:26 danh Exp $
# Perl will figure out which one is valid
'depend' => {'RRDs.c' => "@top_srcdir@/src/.libs/librrd_private.a"},
- 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
+ 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lgd -ljpeg -lttf -lz -lm"},
+ 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lgd -ljpeg -lz -lm"},
'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' }
);

4
net/rrdtool/patches/patch-src_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_Makefile_in,v 1.9 2005/10/12 05:40:00 fgsch Exp $
$OpenBSD: patch-src_Makefile_in,v 1.10 2005/10/24 05:11:01 fgsch Exp $
--- src/Makefile.in.orig 2004-04-06 17:30:25.000000000 -0400
+++ src/Makefile.in 2004-06-08 15:47:47.000000000 -0400
@@ -168,7 +168,7 @@ target_os = @target_os@
@ -38,7 +38,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/10/12 05:40:00 fgsch Exp $
$(PNG_LIB) \
- $(ZLIB_LIB)
+ $(ZLIB_LIB) \
+ -lgd -ljpeg -lttf -liconv
+ -lgd -ljpeg -liconv
lib_LTLIBRARIES = librrd.la