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

fix more breakage; sturm@ ok.

Browse Source
This commit is contained in:
fgsch 2005-10-24 05:12:31 +00:00
parent eb58fb5136
commit 083e258570
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/mrtg/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.47 2005/10/22 14:11:23 fgsch Exp $
# $OpenBSD: Makefile,v 1.48 2005/10/24 05:12:31 fgsch Exp $
COMMENT= "multi-router traffic grapher"
DISTNAME= mrtg-2.12.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}pub/
@ -24,7 +24,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m png ttf jpeg z
WANTLIB= c m png jpeg z
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.57
@ -33,10 +33,7 @@ CONFIGURE_ARGS= --with-gd-inc="${LOCALBASE}/include" \
--with-png-inc="${LOCALBASE}/include" \
--with-png-lib="${LOCALBASE}/lib"
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
LIBS="-liconv"
USE_X11= Yes
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
NO_REGRESS= Yes

6
net/mrtg/patches/patch-configure_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.2 2005/02/27 10:13:51 alek Exp $
$OpenBSD: patch-configure_in,v 1.3 2005/10/24 05:12:31 fgsch Exp $
--- configure.in.orig Tue Jan 13 07:28:11 2004
+++ configure.in Sun Feb 27 10:05:00 2005
@@ -113,6 +113,11 @@ AC_CHECK_LIB(gd,gdImagePng,[
@ -7,8 +7,8 @@ $OpenBSD: patch-configure_in,v 1.2 2005/02/27 10:13:51 alek Exp $
+AC_CHECK_LIB(gd,gdImageStringTTF,[
+ GDFORM_EXT=png
+ GLIBS="-lgd -lpng -lz -ljpeg -lttf"
+ ],:,[-lgd -lpng -lz -ljpeg -lttf ${MATHLIBS}])
+ GLIBS="-lgd -lpng -lz -ljpeg"
+ ],:,[-lgd -lpng -lz -ljpeg ${MATHLIBS}])
+
AC_CHECK_LIB(gd,gdImagePng_jpg,[
GDFORM_EXT=png