ports/176610: [patch] Modernize misc/instant-server

[Kevin Zheng]

>Number:         176610
>Category:       ports
>Synopsis:       [patch] Modernize misc/instant-server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 02 20:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Kevin Zheng
>Release:        9.1-RELEASE-p1
>Organization:
>Environment:
FreeBSD omega.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec  4 06:55:39 UTC 2012     root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
The port misc/instant-server is quite old and isn't particularly useful in new server installations. This patch attempts to address this problem.

 - Trim Makefile header
 - Use OptionsNG to let users pick what ports they want (security, flexibility)
 - Update reference to isc-dhcpd42-server
 - Update COMMENT and pkg-descr
 - Add new ports and take out others
 - Set myself as the new maintainer.

If the committer feels that these changes are too drastic, he/she should re-add all of the old ports and set them in OPTIONS_DEFAULT to mimic old behavior.
>How-To-Repeat:

>Fix:
Apply the attached patch, with changes if deemed appropriate.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 313285)
+++ Makefile	(working copy)
@@ -1,37 +1,57 @@
-# New ports collection makefile for:	instant-server
-# Date created:		12 February 2001
-# Whom:			grog
-#
+# Created by: grog
 # $FreeBSD$
-#
 
 PORTNAME=	instant-server
-PORTVERSION=	1.0
-PORTREVISION=	10
+PORTVERSION=	1.1
 CATEGORIES=	misc
 MASTER_SITES=	# Empty
 DISTFILES=	# None
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Instant server installs a typical set of ports for a server
+MAINTAINER=	kevinz5000 at gmail.com
+COMMENT=	Typical set of server packages
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/postfix:${PORTSDIR}/mail/postfix \
-		${LOCALBASE}/sbin/dhcpd:${PORTSDIR}/net/isc-dhcp41-server \
-		${LOCALBASE}/sbin/smbd:${PORTSDIR}/${SAMBA_PORT} \
-		${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \
-		cnewsdo:${PORTSDIR}/news/cnews \
-		${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
+BATCH=		yes
+NO_BUILD=	yes
 
+OPTIONS_DEFINE=		DHCPD SAMBA
+
+OPTIONS_GROUP=		HTTP MAIL
+OPTIONS_GROUP_HTTP=	APACHE SQUID
+OPTIONS_GROUP_MAIL=	POSTFIX DOVECOT
+
+DHCPD_DESC=	Install the DHCP server from ISC
+SQUID_DESC=	Install Squid web cache
+SQUID_DESC=	Install Dovecot IMAP/POP3 server
+
+OPTIONS_DEFAULT=	APACHE POSTFIX
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDHCPD}
+RUN_DEPENDS+=	${LOCALBASE}/sbin/dhcpd:${PORTSDIR}/net/isc-dhcp42-server
+.endif
+
+.if ${PORT_OPTIONS:MSAMBA}
 SAMBA_PORT?=	net/samba36
+RUN_DEPENDS+=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/${SAMBA_PORT}
+.endif
 
-# Don't let stupid programs ask for configuration.
-
-BATCH=		YES
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
-NO_BUILD=	yes
+.endif
 
-# comms/hylafax irc/ircd-hybrid
+.if ${PORT_OPTIONS:MSQUID}
+RUN_DEPENDS+=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
+.endif
 
+.if ${PORT_OPTIONS:MPOSTFIX}
+RUN_DEPENDS+=	${LOCALBASE}/sbin/postfix:${PORTSDIR}/mail/postfix
+.endif
+
+.if ${PORT_OPTIONS:MDOVECOT}
+RUN_DEPENDS+=	${LOCALBASE}/sbin/dovecot:${PORTSDIR}/mail/dovecot
+.endif
+
 do-install:
 
 .include <bsd.port.mk>
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 313285)
+++ pkg-descr	(working copy)
@@ -1 +1 @@
-instant server installs a typical set of ports for a server
+This is a meta-port for a typical set of packages suitable for a server.
Index: pkg-message
===================================================================
--- pkg-message	(revision 313285)
+++ pkg-message	(working copy)
@@ -1,3 +0,0 @@
-This package does not include online documentation.  You will find PDF
-documents in English and German in the directory
-/usr/local/share/doc/sceptre.


>Release-Note:
>Audit-Trail:
>Unformatted: