Convert my ports to current standards

- Switch USE_GMAKE to USES=gmake
- Define supported options so users can see them in config dialogs
- Use OPTIONS_SUB for plist alteration
- Convert to options macros for better readability
- Use PORTDOCS where it makes sense

2 files changed, 5 insertions, 12 deletions

diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index 7be61a05eaf3..47977cfb948b 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -23,6 +23,9 @@ USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/freefont-${PORTVERSION}
 INSTALLDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PORTDOCS=	AUTHORS ChangeLog CREDITS README
+
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
@@ -32,12 +35,8 @@ do-build:
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 	${MKDIR} ${INSTALLDIR}
 	cd ${WRKSRC} && \
diff --git a/x11-fonts/freefont-ttf/pkg-plist b/x11-fonts/freefont-ttf/pkg-plist
index 2b638844efb6..617212840e7d 100644
--- a/x11-fonts/freefont-ttf/pkg-plist
+++ b/x11-fonts/freefont-ttf/pkg-plist
@@ -12,10 +12,4 @@ lib/X11/fonts/freefont-ttf/FreeSerifBoldItalic.ttf
 lib/X11/fonts/freefont-ttf/FreeSerifItalic.ttf
 lib/X11/fonts/freefont-ttf/fonts.dir
 lib/X11/fonts/freefont-ttf/fonts.scale
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/X11/fonts/freefont-ttf