svn commit: r317494 - in head/textproc: ibus-kmfl ibus-m17n ibus-table m17n-contrib m17n-im-config opensp scim-input-pad sdcv wdiff
Baptiste Daroussin
bapt at FreeBSD.org
Mon May 6 09:26:25 UTC 2013
Author: bapt
Date: Mon May 6 09:26:23 2013
New Revision: 317494
URL: http://svnweb.freebsd.org/changeset/ports/317494
Log:
Finish converting textproc from WITHOUT_NLS to PORT_OPTIONS:MNLS
Modified:
head/textproc/ibus-kmfl/Makefile
head/textproc/ibus-m17n/Makefile
head/textproc/ibus-table/Makefile
head/textproc/m17n-contrib/Makefile
head/textproc/m17n-im-config/Makefile
head/textproc/opensp/Makefile
head/textproc/scim-input-pad/Makefile
head/textproc/sdcv/Makefile
head/textproc/wdiff/Makefile
Modified: head/textproc/ibus-kmfl/Makefile
==============================================================================
--- head/textproc/ibus-kmfl/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/ibus-kmfl/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ibus-kmfl
-# Date created: 4 June 2010
-# Whom: Nikola Lecic <nikola.lecic at anthesphoria.net>
-#
+# Created by: Nikola Lecic <nikola.lecic at anthesphoria.net>
# $FreeBSD$
-#
PORTNAME= ibus-kmfl
PORTVERSION= 1.0.3
@@ -21,14 +17,17 @@ LIB_DEPENDS= ibus-1.0:${PORTSDIR}/textpr
kmflcomp.0:${PORTSDIR}/textproc/kmflcomp
RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp
-USE_GNOME= glib20 pkgconfig
+USES= pkgconfig
+USE_GNOME= glib20
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
Modified: head/textproc/ibus-m17n/Makefile
==============================================================================
--- head/textproc/ibus-m17n/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/ibus-m17n/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ibus-m17n
-# Date created: 3 September 2009
-# Whom: Nikola Lecic <nikola.lecic at anthesphoria.net>
-#
+# Created by: Nikola Lecic <nikola.lecic at anthesphoria.net>
# $FreeBSD$
-#
PORTNAME= ibus-m17n
PORTVERSION= 1.3.3
@@ -24,7 +20,9 @@ PROJECTHOST= ibus
USE_GMAKE= yes
GNU_CONFIGURE= yes
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
Modified: head/textproc/ibus-table/Makefile
==============================================================================
--- head/textproc/ibus-table/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/ibus-table/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -23,7 +23,9 @@ USE_GMAKE= yes
PROJECTHOST= ibus
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
Modified: head/textproc/m17n-contrib/Makefile
==============================================================================
--- head/textproc/m17n-contrib/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/m17n-contrib/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: m17n-contrib
-# Date created: 5 October 2008
-# Whom: Nikola Lecic <nikola.lecic at anthesphoria.net>
-#
+# Created by: Nikola Lecic <nikola.lecic at anthesphoria.net>
# $FreeBSD$
-#
PORTNAME= m17n-contrib
PORTVERSION= 1.1.13
@@ -20,7 +16,9 @@ RUN_DEPENDS= m17n-db>=1.6.3:${PORTSDIR}/
USE_GMAKE= yes
GNU_CONFIGURE= yes
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
Modified: head/textproc/m17n-im-config/Makefile
==============================================================================
--- head/textproc/m17n-im-config/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/m17n-im-config/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: m17n-im-config
-# Date created: 1 October 2008
-# Whom: Nikola Lecic <nikola.lecic at anthesphoria.net>
-#
+# Created by: Nikola Lecic <nikola.lecic at anthesphoria.net>
# $FreeBSD$
-#
PORTNAME= m17n-im-config
PORTVERSION= 0.9.0
@@ -32,7 +28,9 @@ DESKTOP_ENTRIES="M17N-IM Configuration"
"Settings;" \
true
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
Modified: head/textproc/opensp/Makefile
==============================================================================
--- head/textproc/opensp/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/opensp/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: OpenSP
-# Date created: Jan 6, 2003
-# Whom: kuriyama
-#
+# Created by: kuriyama
# $FreeBSD$
-#
PORTNAME= OpenSP
PORTVERSION= 1.5.2
@@ -25,12 +21,14 @@ CONFIGURE_ARGS= --enable-default-catalog
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
#MAN1= onsgmls.1 osgmlnorm.1 ospam.1 ospent.1 osx.1
@@ -44,7 +42,7 @@ PLIST_SUB+= NLS=""
CPPFLAGS:= -O ${CFLAGS:N-O*:N-m*}
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${CAT} ${PLIST} | \
${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \
Modified: head/textproc/scim-input-pad/Makefile
==============================================================================
--- head/textproc/scim-input-pad/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/scim-input-pad/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: scim-input-pad
-# Date created: 2005/05/06
-# Whom: chinsan <chinsan at mail2000.com.tw>
-#
+# Created by: chinsan <chinsan at mail2000.com.tw>
# $FreeBSD$
-#
PORTNAME= scim-input-pad
PORTVERSION= 0.1.3.1
@@ -32,7 +28,9 @@ DESKTOP_ENTRIES="SCIM Input Pad" \
DOCS= ChangeLog README
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
USE_GNOME= intlhack
PLIST_SUB+= NLS=""
@@ -47,7 +45,7 @@ post-patch:
@${REINPLACE_CMD} -E 's|^_NAME|NAME|g' ${WRKSRC}/data/*.pad.in
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
Modified: head/textproc/sdcv/Makefile
==============================================================================
--- head/textproc/sdcv/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/sdcv/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -17,7 +17,9 @@ USE_GNOME= glib20
USES= pkgconfig iconv
SUB_FILES= pkg-message
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
@@ -47,7 +49,7 @@ post-patch:
${WRKSRC}/src/sdcv.cpp
@${REINPLACE_CMD} -e 's, at mandir@/uk, at mandir@,' \
${WRKSRC}/doc/uk/Makefile.in
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
@${REINPLACE_CMD} -e 's, at USE_NLS@,yes,g' ${WRKSRC}/po/Makefile.in.in
@${REINPLACE_CMD} -e 's, getopt.h,,g; s, at USE_NLS@,yes,g' \
${WRKSRC}/src/Makefile.in
Modified: head/textproc/wdiff/Makefile
==============================================================================
--- head/textproc/wdiff/Makefile Mon May 6 09:23:05 2013 (r317493)
+++ head/textproc/wdiff/Makefile Mon May 6 09:26:23 2013 (r317494)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: wdiff
-# Date created: Sep 15, 1997
-# Whom: Yoshiro MIHIRA <sanpei at yy.cs.keio.ac.jp>
-#
+# Created by: Yoshiro MIHIRA <sanpei at yy.cs.keio.ac.jp>
# $FreeBSD$
-#
PORTNAME= wdiff
PORTVERSION= 1.2.1
@@ -20,7 +16,9 @@ GNU_CONFIGURE= yes
MAN1= wdiff.1
INFO= wdiff
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
More information about the svn-ports-all
mailing list