Date: Tue, 4 Jun 2013 14:32:59 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319864 - in head/misc: hello lifelines rabbit Message-ID: <201306041432.r54EWxQ9026286@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Jun 4 14:32:59 2013 New Revision: 319864 URL: http://svnweb.freebsd.org/changeset/ports/319864 Log: WITHOUT_NLS -> PORT_OPTIONS:MNLS NOPORTDOCS -> PORT_OPTIONS:MDOCS Modified: head/misc/hello/Makefile head/misc/lifelines/Makefile head/misc/rabbit/Makefile Modified: head/misc/hello/Makefile ============================================================================== --- head/misc/hello/Makefile Tue Jun 4 14:26:02 2013 (r319863) +++ head/misc/hello/Makefile Tue Jun 4 14:32:59 2013 (r319864) @@ -1,9 +1,5 @@ -# New ports collection makefile for: hello -# Date created: Fri Jul 23, 1999 -# Whom: shipley@dis.org -# +# Created by: shipley@dis.org # $FreeBSD$ -# PORTNAME= hello PORTVERSION= 2.8 @@ -20,7 +16,9 @@ GNU_CONFIGURE= YES MAN1= hello.1 INFO= hello -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/misc/lifelines/Makefile ============================================================================== --- head/misc/lifelines/Makefile Tue Jun 4 14:26:02 2013 (r319863) +++ head/misc/lifelines/Makefile Tue Jun 4 14:32:59 2013 (r319864) @@ -16,7 +16,8 @@ USES= bison iconv MAN1= btedit.1 dbverify.1 llines.1 -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else @@ -27,7 +28,7 @@ PLIST_SUB+= NLS="@comment " post-patch: @${REINPLACE_CMD} -e 's,ncursesw/curses.h,curses.h,' \ ${WRKSRC}/src/hdrs/mycurses.h -.ifdef NOPORTDOCS +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's,install-data-am: install-docDATA,install-data-am:,' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's,install-data-am: install-dist_pkgdataDATA install-docDATA install-man,install-data-am: install-dist_pkgdataDATA,' \ Modified: head/misc/rabbit/Makefile ============================================================================== --- head/misc/rabbit/Makefile Tue Jun 4 14:26:02 2013 (r319863) +++ head/misc/rabbit/Makefile Tue Jun 4 14:32:59 2013 (r319864) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rabbit -# Date created: 2010-08-01 -# Whom: TAKATSU Tomonari <tota@FreeBSD.org> -# +# Created by: TAKATSU Tomonari <tota@FreeBSD.org> # $FreeBSD$ -# PORTNAME= rabbit PORTVERSION= 1.0.9 @@ -32,14 +28,6 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2 USE_RUBY= yes USE_RUBY_SETUP= yes -.if defined(WITHOUT_NLS) -PLIST_SUB+= NLS="@comment " -.else -USES= gettext -RUN_DEPENDS+= rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext -PLIST_SUB+= NLS="" -.endif - RUBY_SHEBANG_FILES= bin/rabbirack \ bin/rabbirc \ bin/rabbit \ @@ -58,6 +46,14 @@ TWITTER_DESC= Run with Twitter .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MNLS} +USES= gettext +RUN_DEPENDS+= rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext +PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " +.endif + .if ${PORT_OPTIONS:MMIMETEX} RUN_DEPENDS+= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex .endif @@ -79,12 +75,12 @@ post-patch: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @cd ${WRKSRC}/sample && ${COPYTREE_SHARE} . ${EXAMPLESDIR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306041432.r54EWxQ9026286>