svn commit: r317491 - in head/sysutils: bacula-server dar dc3dd eiciel fusefs-encfs gnome-schedule lxinput lxtask lxterminal progsreiserfs relaxconf
Baptiste Daroussin
bapt at FreeBSD.org
Mon May 6 09:08:01 UTC 2013
Author: bapt
Date: Mon May 6 09:07:58 2013
New Revision: 317491
URL: http://svnweb.freebsd.org/changeset/ports/317491
Log:
Finish converting sysutils from WITHOUT_NLS to PORT_OPTIONS:MNLS
While here convert bacula-server from USE_GETTEXT to USES=gettext
Modified:
head/sysutils/bacula-server/Makefile
head/sysutils/dar/Makefile
head/sysutils/dc3dd/Makefile
head/sysutils/eiciel/Makefile
head/sysutils/fusefs-encfs/Makefile
head/sysutils/gnome-schedule/Makefile
head/sysutils/lxinput/Makefile
head/sysutils/lxtask/Makefile
head/sysutils/lxterminal/Makefile
head/sysutils/progsreiserfs/Makefile
head/sysutils/relaxconf/Makefile
Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/bacula-server/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -29,7 +29,7 @@ OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX
OPTIONS_DEFAULT?= NLS OPENSSL PGSQL
MTX_DESC= Install mtx for control of autochanger devices
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file
@@ -87,8 +87,8 @@ SUB_LIST= BACULA_USER=${BACULA_USER} \
BACULA_GID=${BACULA_GID} \
BACULA_DIR=${BACULA_DIR}
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
.else
CONFIGURE_ARGS+= --disable-nls
@@ -264,4 +264,4 @@ post-install:
.else
.include "${MASTERDIR}/Makefile.common"
.endif # -client and -server are defined
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/dar/Makefile
==============================================================================
--- head/sysutils/dar/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/dar/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: dar
-# Date created: 3 January 2004
-# Whom: Edson Brandi <ebrandi at fugspbr.org>
-#
+# Created by: Edson Brandi <ebrandi at fugspbr.org>
# $FreeBSD$
-#
PORTNAME= dar
PORTVERSION= 2.3.11
@@ -23,7 +19,9 @@ CPPFLAGS+= -DHAVE_DECL_GETOPT=0
MAN1= dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
@@ -35,7 +33,7 @@ PLIST_SUB+= NLS="@comment "
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.dtd *.txt *.jpg [CR]* ${DOCSDIR}
@${MKDIR} ${DOCSDIR}/samples
Modified: head/sysutils/dc3dd/Makefile
==============================================================================
--- head/sysutils/dc3dd/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/dc3dd/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: dc3dd
-# Date created: 15 February 2011
-# Whom: MANTANI Nobutaka <nobutaka at FreeBSD.org>
-#
+# Created by: MANTANI Nobutaka <nobutaka at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= dc3dd
PORTVERSION= 7.1.614
@@ -25,11 +21,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
MAN1= dc3dd.1
-.if defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+= NLS=""
+.else
CONFIGURE_ARGS= --disable-nls
PLIST_SUB+= NLS="@comment "
-.else
-PLIST_SUB+= NLS=""
.endif
.include <bsd.port.mk>
Modified: head/sysutils/eiciel/Makefile
==============================================================================
--- head/sysutils/eiciel/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/eiciel/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -27,12 +27,14 @@ MAKE_JOBS_SAFE= yes
MAN1= eiciel.1
-.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
post-install:
Modified: head/sysutils/fusefs-encfs/Makefile
==============================================================================
--- head/sysutils/fusefs-encfs/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/fusefs-encfs/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -27,12 +27,14 @@ USES= fuse
USE_GMAKE= yes
USE_LDCONFIG= yes
-.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= encfs.1 encfsctl.1
Modified: head/sysutils/gnome-schedule/Makefile
==============================================================================
--- head/sysutils/gnome-schedule/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/gnome-schedule/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,10 +1,6 @@
-# New ports collection makefile for: gnome-schedule
-# Date created: 2004-11-06
-# Whom: Michael Johnson <ahze at FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
# $MCom: ports/sysutils/gnome-schedule/Makefile,v 1.5 2007/09/10 06:20:14 mezz Exp $
-#
PORTNAME= gnome-schedule
PORTVERSION= 2.1.5
@@ -26,7 +22,7 @@ USE_GNOME= gnomeprefix gnomehack pygnome
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-.if !defined(WITHOUT_APPLET)
+.if !defined(WITHOUT_APPLET)
CONFIGURE_ARGS+= --enable-applet
PLIST_SUB+= APPLET=""
.else
@@ -34,7 +30,9 @@ CONFIGURE_ARGS+= --disable-applet
PLIST_SUB+= APPLET="@comment "
.endif
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
Modified: head/sysutils/lxinput/Makefile
==============================================================================
--- head/sysutils/lxinput/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/lxinput/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lxinput
-# Date created: 2010/09/24
-# Whom: Kris Moore <kmoore at freebsd.org>
-#
+# Created by: Kris Moore <kmoore at freebsd.org>
# $FreeBSD$
-#
PORTNAME= lxinput
PORTVERSION= 0.3.1
@@ -22,7 +18,9 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
MAN1= lxinput.1
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/sysutils/lxtask/Makefile
==============================================================================
--- head/sysutils/lxtask/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/lxtask/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -16,7 +16,9 @@ USES= iconv
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/sysutils/lxterminal/Makefile
==============================================================================
--- head/sysutils/lxterminal/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/lxterminal/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lxterminal
-# Date created: 2010/09/24
-# Whom: Kris Moore <kmoore at freebsd.org>
-#
+# Created by: Kris Moore <kmoore at freebsd.org>
# $FreeBSD$
-#
PORTNAME= lxterminal
PORTVERSION= 0.1.11
@@ -24,7 +20,9 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
MAN1= lxterminal.1
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/sysutils/progsreiserfs/Makefile
==============================================================================
--- head/sysutils/progsreiserfs/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/progsreiserfs/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: progsreiserfs
-# Date created: May 13 2004
-# Whom: Florent Thoumie <flz at xbsd.org>
-#
+# Created by: Florent Thoumie <flz at xbsd.org>
# $FreeBSD$
-#
PORTNAME= progsreiserfs
PORTVERSION= 0.3.1.r8
@@ -22,12 +18,14 @@ CFLAGS+= -Dgetopt_long_only=getopt_long
EXTRA_PATCHES= ${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=--disable-nls
.endif
MAN8= cpfs.reiserfs.8 mkfs.reiserfs.8 reiserfs.8 \
Modified: head/sysutils/relaxconf/Makefile
==============================================================================
--- head/sysutils/relaxconf/Makefile Mon May 6 09:07:30 2013 (r317490)
+++ head/sysutils/relaxconf/Makefile Mon May 6 09:07:58 2013 (r317491)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: RelaxBSD
-# Date created: 2005-10-12
-# Whom: Yinghong Liu <relaxbsd at gmail.com>
-#
+# Created by: Yinghong Liu <relaxbsd at gmail.com>
# $FreeBSD$
-#
PORTNAME= relaxconf
PORTVERSION= 1.1.1
@@ -20,12 +16,14 @@ RUN_DEPENDS= cdialog:${PORTSDIR}/devel/c
GNU_CONFIGURE= yes
-.if defined(WITHOUT_NLS)
-PLIST_SUB+= NLS="@comment "
-CONFIGURE_ARGS+=--disable-nls
-.else
+.include <bsd.port.options.mK>
+
+.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
USES+= gettext
+.else
+PLIST_SUB+= NLS="@comment "
+CONFIGURE_ARGS+=--disable-nls
.endif
.include <bsd.port.mk>
More information about the svn-ports-all
mailing list