o Main modification

  graphics/gd(based on 1.8.4)    -> graphics/gd1
  graphics/gd2(based on 2.0.15)  -> graphics/gd
  graphics/p5-GD(based on 1.41)  -> graphics/p5-GD1
  graphics/p5-GD2(based on 2.07) -> graphics/p5-GD
  japanese/gd                    -> japanese/gd1
  japanese/gd2                   -> japanese/gd
o Include some feature
  WITH_XPM(w/, w/o WITHOUT_X11)
o Chase this modification
o Fix build error [1]

PR:		ports/54540
Submitted by:	Ports Fury
Approved by:	maintainer (blanket)
Reported by:	bento via kris [1]

6 files changed, 41 insertions, 65 deletions

diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index c0784deb2d99..144a0637530a 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.29
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
@@ -20,14 +20,14 @@ COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include
+		--with-gd-inc=${LOCALBASE}/include/gd
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include/gd
+		--with-gd-inc=${LOCALBASE}/include
 .endif
 
 USE_PERL5=	YES
@@ -43,10 +43,10 @@ MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
-.if defined(WITH_GD2)
-	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
-.else
+.if defined(WITH_GD1)
 	${PERL} -pi -e 's:%%GD%%:-lgd1:g' ${WRKSRC}/configure
+.else
+	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
 .endif
 
 do-install:
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile
index 9a042d807eae..05c660ff4a87 100644
--- a/net-mgmt/netsaint/Makefile
+++ b/net-mgmt/netsaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
@@ -18,18 +18,16 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
 
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--with-command-grp=www \
+		--with-gd-lib=${LOCALBASE}/lib \
+		--with-gd-inc=${LOCALBASE}/include \
 		--with-netsaint-user=netsaint \
 		--with-netsaint-grp=netsaint \
 		--sbindir=${PREFIX}/share/netsaint/sbin \
@@ -37,6 +35,7 @@ CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--datadir=${PREFIX}/share/netsaint \
 		--sysconfdir=${PREFIX}/etc/netsaint \
 		--localstatedir=${PREFIX}/var/netsaint
+INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
@@ -53,18 +52,14 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
-INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
-
 pre-fetch:
 	@${SH} ${SCRIPTDIR}/checkps
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
 post-install:
-.for i in ${BSDIMAGES}
+.for i in bsd_logofullsize.gif bsd_sblogo.gif
 	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
diff --git a/net-mgmt/netsaint/files/patch-ad b/net-mgmt/netsaint/files/patch-ad
index 6d8038c4bd21..aeb6f67857ca 100644
--- a/net-mgmt/netsaint/files/patch-ad
+++ b/net-mgmt/netsaint/files/patch-ad
@@ -21,22 +21,3 @@
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
- 	LDFLAGS="${LDFLAGS} -L${withval}"
- 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- 	
-+else
-+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
- 
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
-   withval="$with_gd_inc"
-   
- 	CFLAGS="${CFLAGS} -I${withval}"
-+else
-+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
- 	
- fi
-