From 28e615f24b937ec2ce73c3c951bc5ab27358a869 Mon Sep 17 00:00:00 2001 From: bapt Date: Mon, 6 May 2013 09:26:23 +0000 Subject: Finish converting textproc from WITHOUT_NLS to PORT_OPTIONS:MNLS --- textproc/ibus-kmfl/Makefile | 13 ++++++------- textproc/ibus-m17n/Makefile | 10 ++++------ textproc/ibus-table/Makefile | 4 +++- textproc/m17n-contrib/Makefile | 10 ++++------ textproc/m17n-im-config/Makefile | 10 ++++------ textproc/opensp/Makefile | 18 ++++++++---------- textproc/scim-input-pad/Makefile | 12 +++++------- textproc/sdcv/Makefile | 6 ++++-- textproc/wdiff/Makefile | 10 ++++------ 9 files changed, 42 insertions(+), 51 deletions(-) (limited to 'textproc') diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile index 4166cbbeecbd..e7579d6da862 100644 --- a/textproc/ibus-kmfl/Makefile +++ b/textproc/ibus-kmfl/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ibus-kmfl -# Date created: 4 June 2010 -# Whom: Nikola Lecic -# +# Created by: Nikola Lecic # $FreeBSD$ -# PORTNAME= ibus-kmfl PORTVERSION= 1.0.3 @@ -21,14 +17,17 @@ LIB_DEPENDS= ibus-1.0:${PORTSDIR}/textproc/ibus \ 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 + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile index e381a9b57642..811c9d51cdf3 100644 --- a/textproc/ibus-m17n/Makefile +++ b/textproc/ibus-m17n/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ibus-m17n -# Date created: 3 September 2009 -# Whom: Nikola Lecic -# +# Created by: Nikola Lecic # $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 + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile index 5929c741e68c..1d6c4e8e7fdc 100644 --- a/textproc/ibus-table/Makefile +++ b/textproc/ibus-table/Makefile @@ -23,7 +23,9 @@ USE_GMAKE= yes PROJECTHOST= ibus -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else diff --git a/textproc/m17n-contrib/Makefile b/textproc/m17n-contrib/Makefile index a28981bbade4..80f9ec6a24e5 100644 --- a/textproc/m17n-contrib/Makefile +++ b/textproc/m17n-contrib/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: m17n-contrib -# Date created: 5 October 2008 -# Whom: Nikola Lecic -# +# Created by: Nikola Lecic # $FreeBSD$ -# PORTNAME= m17n-contrib PORTVERSION= 1.1.13 @@ -20,7 +16,9 @@ RUN_DEPENDS= m17n-db>=1.6.3:${PORTSDIR}/devel/m17n-db USE_GMAKE= yes GNU_CONFIGURE= yes -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile index 667665236a34..eac7d1732493 100644 --- a/textproc/m17n-im-config/Makefile +++ b/textproc/m17n-im-config/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: m17n-im-config -# Date created: 1 October 2008 -# Whom: Nikola Lecic -# +# Created by: Nikola Lecic # $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 + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile index be6ff5b06108..6ac5bac274d3 100644 --- a/textproc/opensp/Makefile +++ b/textproc/opensp/Makefile @@ -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=${PREFIX}/share/sgml/catalog \ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include + +.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/=/%%!/} | \ diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile index 809021f21b6f..f32d69eafd29 100644 --- a/textproc/scim-input-pad/Makefile +++ b/textproc/scim-input-pad/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: scim-input-pad -# Date created: 2005/05/06 -# Whom: chinsan -# +# Created by: chinsan # $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 + +.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 diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile index b34c548ce3d4..b6f2c0fdbd1b 100644 --- a/textproc/sdcv/Makefile +++ b/textproc/sdcv/Makefile @@ -17,7 +17,9 @@ USE_GNOME= glib20 USES= pkgconfig iconv SUB_FILES= pkg-message -.if !defined(WITHOUT_NLS) +.include + +.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,@mandir@/uk,@mandir@,' \ ${WRKSRC}/doc/uk/Makefile.in -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's,@USE_NLS@,yes,g' ${WRKSRC}/po/Makefile.in.in @${REINPLACE_CMD} -e 's, getopt.h,,g; s,@USE_NLS@,yes,g' \ ${WRKSRC}/src/Makefile.in diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile index 08a245b81864..0ff225977c8b 100644 --- a/textproc/wdiff/Makefile +++ b/textproc/wdiff/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: wdiff -# Date created: Sep 15, 1997 -# Whom: Yoshiro MIHIRA -# +# Created by: Yoshiro MIHIRA # $FreeBSD$ -# PORTNAME= wdiff PORTVERSION= 1.2.1 @@ -20,7 +16,9 @@ GNU_CONFIGURE= yes MAN1= wdiff.1 INFO= wdiff -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext CFLAGS+= -I${LOCALBASE}/include PLIST_SUB+= NLS="" -- cgit