- Add stage support

- Remove indefinite article from COMMENT
- Add DOCS and EXAMPLES options

2 files changed, 52 insertions, 56 deletions

diff --git a/games/libdungeonmaker/Makefile b/games/libdungeonmaker/Makefile
index d95c2f5aec8c..acfa08459d79 100644
--- a/games/libdungeonmaker/Makefile
+++ b/games/libdungeonmaker/Makefile
@@ -8,30 +8,26 @@ MASTER_SITES=	SF/dungeonmaker/dungeonmaker/${PORTVERSION}
 DISTNAME=	dungeonmaker-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program/library that "grows" dungeons for use in isometric games
+COMMENT=	Program/library that "grows" dungeons for use in isometric games
 
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
-PLIST_SUB+=	HAS_DOCS=${HAS_DOCS}
-
-NO_STAGE=	yes
-post-extract:
-	@${CP} ${WRKSRC}/Makefile.bsd ${WRKSRC}/Makefile
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/DM2_Manual/* ${DOCSDIR}
-
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/design* ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/main.cpp ${EXAMPLESDIR}
-
-	@${CAT} ${PKGMESSAGE}
-HAS_DOCS=""
-.else
-HAS_DOCS="@comment "
-.endif
+
+MAKEFILE=	Makefile.bsd
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.so.2 ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker_p.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL} ${WRKSRC}/DungeonMaker.h ${STAGEDIR}${PREFIX}/include
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/DM2_Manual/* ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/design* ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/main.cpp ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/games/libdungeonmaker/pkg-plist b/games/libdungeonmaker/pkg-plist
index f492b079f353..ee3bba2b8915 100644
--- a/games/libdungeonmaker/pkg-plist
+++ b/games/libdungeonmaker/pkg-plist
@@ -3,38 +3,38 @@ lib/libdungeonmaker.a
 lib/libdungeonmaker.so
 lib/libdungeonmaker.so.2
 lib/libdungeonmaker_p.a
-%%HAS_DOCS%%%%DOCSDIR%%/Contents.gif
-%%HAS_DOCS%%%%DOCSDIR%%/Next.gif
-%%HAS_DOCS%%%%DOCSDIR%%/Prev.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA1.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA2.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA3.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA4.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA5.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA6.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA7.gif
-%%HAS_DOCS%%%%DOCSDIR%%/capturedA8.gif
-%%HAS_DOCS%%%%DOCSDIR%%/index.html
-%%HAS_DOCS%%%%DOCSDIR%%/manDesign.txt
-%%HAS_DOCS%%%%DOCSDIR%%/manVision.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual0.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual1.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual2.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual3.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual4.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual5.html
-%%HAS_DOCS%%%%DOCSDIR%%/manual9.html
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design2
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design3A
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design3WithTunnelers
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design4A
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design5
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design6
-%%HAS_DOCS%%%%EXAMPLESDIR%%/design7
-%%HAS_DOCS%%%%EXAMPLESDIR%%/designEmpty
-%%HAS_DOCS%%%%EXAMPLESDIR%%/designEmpty2
-%%HAS_DOCS%%%%EXAMPLESDIR%%/designOld1
-%%HAS_DOCS%%%%EXAMPLESDIR%%/main.cpp
-%%HAS_DOCS%%@dirrm %%EXAMPLESDIR%%
-%%HAS_DOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/Contents.gif
+%%PORTDOCS%%%%DOCSDIR%%/Next.gif
+%%PORTDOCS%%%%DOCSDIR%%/Prev.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA1.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA2.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA3.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA4.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA5.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA6.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA7.gif
+%%PORTDOCS%%%%DOCSDIR%%/capturedA8.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manDesign.txt
+%%PORTDOCS%%%%DOCSDIR%%/manVision.html
+%%PORTDOCS%%%%DOCSDIR%%/manual0.html
+%%PORTDOCS%%%%DOCSDIR%%/manual1.html
+%%PORTDOCS%%%%DOCSDIR%%/manual2.html
+%%PORTDOCS%%%%DOCSDIR%%/manual3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual5.html
+%%PORTDOCS%%%%DOCSDIR%%/manual9.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design3A
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design3WithTunnelers
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design4A
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/design7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designEmpty
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designEmpty2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designOld1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cpp
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%