From owner-svn-ports-head@FreeBSD.ORG Fri Jul 4 23:16:50 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25EC8F31; Fri, 4 Jul 2014 23:16:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06A582D0D; Fri, 4 Jul 2014 23:16:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64NGneD046295; Fri, 4 Jul 2014 23:16:49 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64NGm80046286; Fri, 4 Jul 2014 23:16:48 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407042316.s64NGm80046286@svn.freebsd.org> From: Adam Weinberger Date: Fri, 4 Jul 2014 23:16:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360682 - in head/x11: keynav mrxvt multi-aterm mxico stalonetray wmcliphist xkeywrap xsel-conrad yalias X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2014 23:16:50 -0000 Author: adamw Date: Fri Jul 4 23:16:47 2014 New Revision: 360682 URL: http://svnweb.freebsd.org/changeset/ports/360682 QAT: https://qat.redports.org/buildarchive/r360682/ Log: Remove NOPORTDOCS and NOPORTEXAMPLES. Modified: head/x11/keynav/Makefile head/x11/mrxvt/Makefile head/x11/multi-aterm/Makefile head/x11/mxico/Makefile head/x11/stalonetray/Makefile head/x11/wmcliphist/Makefile head/x11/xkeywrap/Makefile head/x11/xsel-conrad/Makefile head/x11/yalias/Makefile Modified: head/x11/keynav/Makefile ============================================================================== --- head/x11/keynav/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/keynav/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -20,13 +20,11 @@ USE_XORG= xtst x11 xinerama PLIST_FILES= bin/keynav PORTEXAMPLES= keynavrc -.include +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 +.include Modified: head/x11/mrxvt/Makefile ============================================================================== --- head/x11/mrxvt/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/mrxvt/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -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 .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 Modified: head/x11/multi-aterm/Makefile ============================================================================== --- head/x11/multi-aterm/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/multi-aterm/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -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 Modified: head/x11/mxico/Makefile ============================================================================== --- head/x11/mxico/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/mxico/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -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 Modified: head/x11/stalonetray/Makefile ============================================================================== --- head/x11/stalonetray/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/stalonetray/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -21,18 +21,16 @@ PORTDOCS= AUTHORS ChangeLog NEWS README 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 Modified: head/x11/wmcliphist/Makefile ============================================================================== --- head/x11/wmcliphist/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/wmcliphist/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -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 Modified: head/x11/xkeywrap/Makefile ============================================================================== --- head/x11/xkeywrap/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/xkeywrap/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -17,14 +17,14 @@ PORTDOCS= README demo.dat xkeywrap_demo. 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 Modified: head/x11/xsel-conrad/Makefile ============================================================================== --- head/x11/xsel-conrad/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/xsel-conrad/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -25,6 +25,8 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${ 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 Modified: head/x11/yalias/Makefile ============================================================================== --- head/x11/yalias/Makefile Fri Jul 4 23:13:46 2014 (r360681) +++ head/x11/yalias/Makefile Fri Jul 4 23:16:47 2014 (r360682) @@ -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