STAGE support, and general cleanups. Some of the changes are a

bit more aggressive, but at this point, if I'm staging your port,
you've likely stopped caring what's done to it.

4 files changed, 30 insertions, 55 deletions

diff --git a/security/amap/Makefile b/security/amap/Makefile
index f38c8f70e4d1..5d957d9f3792 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	amap
 PORTVERSION=	5.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_PACKETSTORM}
 MASTER_SITE_SUBDIR=	groups/thc
@@ -15,19 +16,11 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 USE_OPENSSL=	yes
 
-MAN1=		amap.1
-.if !defined(NOPORTDOCS)
+PORT_OPTIONS=	DOCS
 PORTDOCS=	README TODO CHANGES AMAP-LIB-INTERFACE
-.endif
-PLIST_SUB=	AMAPLIBDIR=lib/${PORTNAME} AMAPINCDIR=include/${PORTNAME}
 
-CONF_DIR=	${PREFIX}/etc/${PORTNAME}
 LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
 
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	LOCAL_CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}"
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g; \
@@ -38,26 +31,23 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|etc/|etc/amap/|g' ${WRKSRC}/amap-lib.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin
-	${LN} -s ${PREFIX}/bin/amap ${PREFIX}/bin/amap6
-	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/amap-lib.o ${PREFIX}/lib/${PORTNAME}
-	${MKDIR} ${PREFIX}/include/${PORTNAME}
-.	for i in amap.h amap-inc.h amap-lib.h
-		${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include/${PORTNAME}
-.	endfor
-	${MKDIR} ${CONF_DIR}
-.	for i in ${LOCAL_CONF_FILES}
-		${INSTALL_DATA} ${WRKSRC}/${i} ${CONF_DIR}/${i}.default
-.	endfor
-	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1
-.	if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-.		for i in ${PORTDOCS}
-			${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
-.		endfor
-.	endif
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL_PROGRAM} ${WRKSRC}/amap ${STAGEDIR}${PREFIX}/bin
+	${LN} -s amap ${STAGEDIR}${PREFIX}/bin/amap6
+	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/amap-lib.o ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+.for i in amap.h amap-inc.h amap-lib.h
+		${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+.endfor
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+.for i in ${LOCAL_CONF_FILES}
+		${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/amap.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+		${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/security/amap/files/pkg-deinstall.in b/security/amap/files/pkg-deinstall.in
deleted file mode 100644
index 90ac66a8f50d..000000000000
--- a/security/amap/files/pkg-deinstall.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-[ "$2" != "DEINSTALL" ] && exit 0
-
-for f in %%LOCAL_CONF_FILES%%; do
-    if cmp -s "%%CONF_DIR%%/$f" "%%CONF_DIR%%/$f.default"; then
-	rm -f "%%CONF_DIR%%/$f"
-    fi
-done
diff --git a/security/amap/files/pkg-install.in b/security/amap/files/pkg-install.in
deleted file mode 100644
index 3b5ad1e0669b..000000000000
--- a/security/amap/files/pkg-install.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$2" != "POST-INSTALL" ] && exit 0
-
-for f in %%LOCAL_CONF_FILES%%; do
-    [ -f "%%CONF_DIR%%/$f" ] || cp -p "%%CONF_DIR%%/$f.default" "%%CONF_DIR%%/$f"
-done
diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist
index e849e51c864e..f3fa7c076afb 100644
--- a/security/amap/pkg-plist
+++ b/security/amap/pkg-plist
@@ -1,13 +1,14 @@
 bin/amap
 bin/amap6
 bin/amapcrap
-etc/amap/appdefs.resp.default
-etc/amap/appdefs.rpc.default
-etc/amap/appdefs.trig.default
-%%AMAPLIBDIR%%/amap-lib.o
-%%AMAPINCDIR%%/amap.h
-%%AMAPINCDIR%%/amap-inc.h
-%%AMAPINCDIR%%/amap-lib.h
-@dirrm %%AMAPLIBDIR%%
-@dirrm %%AMAPINCDIR%%
+@sample %%ETCDIR%%/appdefs.resp.sample
+@sample %%ETCDIR%%/appdefs.rpc.sample
+@sample %%ETCDIR%%/appdefs.trig.sample
+include/amap/amap.h
+include/amap/amap-inc.h
+include/amap/amap-lib.h
+lib/amap/amap-lib.o
+man/man1/amap.1.gz
+@dirrm lib/amap
+@dirrm include/amap
 @dirrmtry etc/amap