net/binkd: support stage

3 files changed, 15 insertions, 101 deletions

diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index d66137a4f1c5..422003bffcbb 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -16,38 +16,27 @@ USES=		zip
 USE_RC_SUBR=	binkd
 GNU_CONFIGURE=	yes
 
-MAKE_JOBS_UNSAFE=	yes
-
-MAN8=		binkd.8
+USERS=		fido
+GROUPS=		fido
 
-.if !defined(WITHOUT_AMIGA4D)
-CONFIGURE_ARGS+=	--with-aso
-.endif
+MAKE_JOBS_UNSAFE=	yes
 
-.if !defined(WITHOUT_HTTPS)
-CONFIGURE_ARGS+=	--with-https
-.endif
+OPTIONS_DEFINE=	AMIGA4D DOCS HTTPS
+AMIGA4D_CONFIGUTE_WITH=	aso
+HTTPS_CONFIGURE_WITH=	https
 
-NO_STAGE=	yes
 pre-configure:
 	@${RM} -rf ${WRKSRC}/mkfls/unix/CVS
 	@${CP} ${WRKSRC}/mkfls/unix/* ${WRKSRC}/
 	@${CHMOD} a+x ${WRKSRC}/configure
 
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/binkd ${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/binkd.8 ${MANPREFIX}/man/man8
-	@${INSTALL_DATA} ${WRKSRC}/binkd.cfg ${PREFIX}/etc/binkd.cfg.sample
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/!README ${DOCSDIR}/README
-	@${INSTALL_DATA} ${WRKSRC}/!README.FIX ${DOCSDIR}/README.FIX
-	@${INSTALL_DATA} ${WRKSRC}/!SRIF.TXT ${DOCSDIR}/SRIF.TXT
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/binkd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/binkd.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/binkd.cfg ${STAGEDIR}${PREFIX}/etc/binkd.cfg.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/!README ${STAGEDIR}${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/!README.FIX ${STAGEDIR}${DOCSDIR}/README.FIX
+	${INSTALL_DATA} ${WRKSRC}/!SRIF.TXT ${STAGEDIR}${DOCSDIR}/SRIF.TXT
 
 .include <bsd.port.mk>
diff --git a/net/binkd/pkg-install b/net/binkd/pkg-install
deleted file mode 100644
index c20a81747eff..000000000000
--- a/net/binkd/pkg-install
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-USER=fido
-GROUP=fido
-UID=111
-GID=111
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-USER=$(ask "Run ${1} as user" ${USER}) 
-UID=$(ask "Enter ${USER} user UID" ${UID}) 
-GROUP=$(ask "Enter group name for ${1} user" ${GROUP}) 
-GID=$(ask "Enter ${GROUP} group GID" ${GID}) 
-echo "Run ${1} as uid=${UID}(${USER}) gid=${GID}(${GROUP})"
-
-if [ x"$2" = xPRE-INSTALL ]; then
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-           -d ${PKG_PREFIX}/fido \
-           -c "Fido System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-fi
diff --git a/net/binkd/pkg-plist b/net/binkd/pkg-plist
index ae3f014414c7..23087a4b5bfc 100644
--- a/net/binkd/pkg-plist
+++ b/net/binkd/pkg-plist
@@ -1,5 +1,6 @@
-etc/binkd.cfg.sample
+@sample etc/binkd.cfg.sample
 sbin/binkd
+man/man8/binkd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FIX
 %%PORTDOCS%%%%DOCSDIR%%/SRIF.TXT