diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 4cd23ded0661..58d5af39282d 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -14,11 +15,7 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD1)
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
-.else
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-.endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 USE_GETOPT_LONG=yes
@@ -34,17 +31,22 @@ NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
-CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
+OPTIONS=	MYSQL "MySQL suport" off \
+		PGSQL "PostgreSQL suport" off \
+		FILE_PERFDATA "Save performance data to files" off
+
+.include <bsd.port.pre.mk>
+
+CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
-		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
+		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib -lgd"
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-grp=www \
 		--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-grp=${NAGIOSGROUP} \
 		--with-template-objects \
-		--with-template-extinfo \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
@@ -52,26 +54,20 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD1)
-INCGD=		-I${LOCALBASE}/include/gd
-LIBGD=		-lgd1
-.else
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.endif
-
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
+.else
+CONFIGURE_ARGS+=	--with-template-extinfo
 .endif
 
-.if defined(NAGIOS_FILE_PERFDATA)
+.if defined(WITH_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
-.if defined(WITH_POSTGRES)
+.if defined(WITH_PGSQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
@@ -86,16 +82,6 @@ SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
 
 INSTALL_TARGET=	all install config install-config install-commandmode
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "nagios has the following tunables:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_MYSQL=yes		Compile with MySQL suport"
-	@${ECHO_MSG} "  WITH_POSTGRES=yes		Compile with PostgreSQL suport"
-	@${ECHO_MSG} "  WITH_GD1=yes			Compile with GD1 instead of GD2"
-	@${ECHO_MSG} "  NAGIOS_FILE_PERFDATA=yes	Save performance data to files"
-	@${ECHO_MSG} ""
-
 pre-build:
 	for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
@@ -108,4 +94,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index 4cd23ded0661..58d5af39282d 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -14,11 +15,7 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD1)
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
-.else
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-.endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 USE_GETOPT_LONG=yes
@@ -34,17 +31,22 @@ NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
-CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
+OPTIONS=	MYSQL "MySQL suport" off \
+		PGSQL "PostgreSQL suport" off \
+		FILE_PERFDATA "Save performance data to files" off
+
+.include <bsd.port.pre.mk>
+
+CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
-		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
+		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib -lgd"
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-grp=www \
 		--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-grp=${NAGIOSGROUP} \
 		--with-template-objects \
-		--with-template-extinfo \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
@@ -52,26 +54,20 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD1)
-INCGD=		-I${LOCALBASE}/include/gd
-LIBGD=		-lgd1
-.else
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.endif
-
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
+.else
+CONFIGURE_ARGS+=	--with-template-extinfo
 .endif
 
-.if defined(NAGIOS_FILE_PERFDATA)
+.if defined(WITH_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
-.if defined(WITH_POSTGRES)
+.if defined(WITH_PGSQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
@@ -86,16 +82,6 @@ SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
 
 INSTALL_TARGET=	all install config install-config install-commandmode
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "nagios has the following tunables:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_MYSQL=yes		Compile with MySQL suport"
-	@${ECHO_MSG} "  WITH_POSTGRES=yes		Compile with PostgreSQL suport"
-	@${ECHO_MSG} "  WITH_GD1=yes			Compile with GD1 instead of GD2"
-	@${ECHO_MSG} "  NAGIOS_FILE_PERFDATA=yes	Save performance data to files"
-	@${ECHO_MSG} ""
-
 pre-build:
 	for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
@@ -108,4 +94,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 4cd23ded0661..58d5af39282d 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -14,11 +15,7 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD1)
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
-.else
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-.endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 USE_GETOPT_LONG=yes
@@ -34,17 +31,22 @@ NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
-CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
+OPTIONS=	MYSQL "MySQL suport" off \
+		PGSQL "PostgreSQL suport" off \
+		FILE_PERFDATA "Save performance data to files" off
+
+.include <bsd.port.pre.mk>
+
+CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
-		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
+		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib -lgd"
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-grp=www \
 		--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-grp=${NAGIOSGROUP} \
 		--with-template-objects \
-		--with-template-extinfo \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
@@ -52,26 +54,20 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD1)
-INCGD=		-I${LOCALBASE}/include/gd
-LIBGD=		-lgd1
-.else
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.endif
-
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
+.else
+CONFIGURE_ARGS+=	--with-template-extinfo
 .endif
 
-.if defined(NAGIOS_FILE_PERFDATA)
+.if defined(WITH_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
-.if defined(WITH_POSTGRES)
+.if defined(WITH_PGSQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
@@ -86,16 +82,6 @@ SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
 
 INSTALL_TARGET=	all install config install-config install-commandmode
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "nagios has the following tunables:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_MYSQL=yes		Compile with MySQL suport"
-	@${ECHO_MSG} "  WITH_POSTGRES=yes		Compile with PostgreSQL suport"
-	@${ECHO_MSG} "  WITH_GD1=yes			Compile with GD1 instead of GD2"
-	@${ECHO_MSG} "  NAGIOS_FILE_PERFDATA=yes	Save performance data to files"
-	@${ECHO_MSG} ""
-
 pre-build:
 	for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
@@ -108,4 +94,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>