Remove NOPORTDOCS and NOPORTEXAMPLES.

9 files changed, 31 insertions, 56 deletions

diff --git a/x11/keynav/Makefile b/x11/keynav/Makefile
index d94a8c61e083..153d73a8dc1b 100644
--- a/x11/keynav/Makefile
+++ b/x11/keynav/Makefile
@@ -20,13 +20,11 @@ USE_XORG=	xtst x11 xinerama
 PLIST_FILES=	bin/keynav
 PORTEXAMPLES=	keynavrc
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keynav ${STAGEDIR}${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/keynavrc ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index c5750d4c49cd..2cea667e9785 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -19,42 +19,32 @@ CONFLICTS=	mrxvt-0.5.*
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
 
+OPTIONS_DEFINE=	DOCS JAPANESE XFT
+
+JAPANESE_CONFIGURE_ON=	--enable-xim --enable-cjk --with-encoding=eucj
+XFT_LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+XFT_CONFIGURE_ENABLE=	xft
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 900007
 CONFIGURE_ARGS+=	--disable-lastlog --disable-wtmp
 .endif
 
-.if defined(WITH_JAPANESE)
-CONFIGURE_ARGS+=	--enable-xim --enable-cjk --with-encoding=eucj
-.endif # WITH_JAPANESE
-
-.if defined(WITH_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-CONFIGURE_ARGS+=	--enable-xft
-.endif
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	TIPS \
-			README.greek \
-			README.menu \
-			README.xvt \
-			xdefaults-sample.txt \
-			xterm.seq \
-			mrxvt.vbs \
-			mrxvtset.pl
-.endif
+		README.greek \
+		README.menu \
+		README.xvt \
+		xdefaults-sample.txt \
+		xterm.seq \
+		mrxvt.vbs \
+		mrxvtset.pl
 
-pre-everything::
-	@${ECHO_MSG} "=========================================>"
-	@${ECHO_MSG} "For Japanese support use make -DWITH_JAPANESE install"
-	@${ECHO_MSG} "For XFT support use make -DWITH_XFT install"
-	@${ECHO_MSG} "=========================================>"
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 post-patch:
 	@${REINPLACE_CMD} -e '/^\(install-data-am:\).*/ \
 		s/install-docDATA //' ${WRKSRC}/doc/Makefile.in
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index d4840ce99e77..fe1160e543df 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -16,24 +16,13 @@ CONFIGURE_ARGS=--with-xpm=${LOCALBASE}
 
 DOCS=		AUTHORS ChangeLog INSTALL TODO
 
-.if defined(WITH_UTMP)
-CONFIGURE_ARGS+=	--enable-utmp
-.endif
+OPTIONS_DEFINE=	DOCS UTMP WTMP
 
-.if defined(WITH_WTMP)
-CONFIGURE_ARGS+=	--enable-wtmp
-.endif
+UTMP_CONFIGURE_ON=	--enable-utmp
+WTMP_CONFIGURE_ON=	--enable-wtmp
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can specify the following options:"
-	@${ECHO_MSG} "WITH_UTMP=yes - enable utmp support"
-	@${ECHO_MSG} "WITH_WTMP=yes - enable wtmp support"
-
-.if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile
index d9d51321afba..99d1c5f4f41e 100644
--- a/x11/mxico/Makefile
+++ b/x11/mxico/Makefile
@@ -17,11 +17,11 @@ USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/READMEj ${STAGEDIR}${DOCSDIR})
 	@(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/README ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile
index 7397e73f27b2..ae043b7cdf29 100644
--- a/x11/stalonetray/Makefile
+++ b/x11/stalonetray/Makefile
@@ -21,18 +21,16 @@ PORTDOCS=	AUTHORS ChangeLog NEWS README TODO stalonetray.html
 PORTEXAMPLES=	stalonetrayrc.sample
 PLIST_FILES=	bin/stalonetray man/man1/stalonetray.1.gz
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for file in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index f163b8706e56..d7970d3319a3 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -18,13 +18,13 @@ USES=		pkgconfig
 USE_XORG=	xpm
 USE_GNOME=	gtk20
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/wmcliphistrc ${STAGEDIR}${EXAMPLESDIR}
-.ifndef(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif #NOPORTDOCS
 
 .include <bsd.port.mk>
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index f58330c99b7b..ae61659170c5 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -17,14 +17,14 @@ PORTDOCS=	README demo.dat xkeywrap_demo.c
 
 PLIST_FILES=	bin/xkeywrap man/man1/${PORTNAME}.1.gz
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xkeywrap ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xkeywrap.1.gz ${STAGEDIR}${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile
index 9f4c31190072..261c3094c7cd 100644
--- a/x11/xsel-conrad/Makefile
+++ b/x11/xsel-conrad/Makefile
@@ -25,6 +25,8 @@ PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTDOCS=	ChangeLog README
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|jmp_buf|sigjmp_buf|g' ${WRKSRC}/xsel.c
 	@${REINPLACE_CMD} -e 's|@X_CFLAGS@|${CFLAGS}|;\
@@ -33,9 +35,7 @@ post-patch:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
-.ifndef NOPORTDOCS
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
 	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index 4ea2ca8fc130..8bd65e19be75 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -17,10 +17,10 @@ USE_GNOME=	gtk20
 ALL_TARGET=	yalias
 MAKE_ARGS=	prefix=${PREFIX} YALIASDIR=${DATADIR}
 
-.ifndef(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>