Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Dec 2012 21:29:04 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r309200 - in head: archivers/gcpio archivers/gtar archivers/xz audio/flac audio/libogg audio/libvorbis audio/vorbis-tools audio/xmms-shn audio/xmms-xf86audio
Message-ID:  <201212182129.qBILT4LM032919@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Tue Dec 18 21:29:04 2012
New Revision: 309200
URL: http://svnweb.freebsd.org/changeset/ports/309200

Log:
  Convert to OptionsNG and trim Makefile headers.

Modified:
  head/archivers/gcpio/Makefile   (contents, props changed)
  head/archivers/gtar/Makefile   (contents, props changed)
  head/archivers/xz/Makefile   (contents, props changed)
  head/audio/flac/Makefile
  head/audio/libogg/Makefile   (contents, props changed)
  head/audio/libvorbis/Makefile   (contents, props changed)
  head/audio/vorbis-tools/Makefile   (contents, props changed)
  head/audio/xmms-shn/Makefile   (contents, props changed)
  head/audio/xmms-xf86audio/Makefile   (contents, props changed)

Modified: head/archivers/gcpio/Makefile
==============================================================================
--- head/archivers/gcpio/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/archivers/gcpio/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -18,7 +18,12 @@ CONFIGURE_ARGS=	--program-prefix=g \
 		--disable-silent-rules \
 		--with-rmt=/etc/rmt
 
-.if !defined(WITHOUT_NLS)
+INFO=		cpio
+MAN1=		gcpio.1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
@@ -27,9 +32,6 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-INFO=		cpio
-MAN1=		gcpio.1
-
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
 

Modified: head/archivers/gtar/Makefile
==============================================================================
--- head/archivers/gtar/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/archivers/gtar/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gtar
-# Date created:		Sa   6 Jun 1998 10:24:51 CEST
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
+# Created by: Andreas Klemm <andreas@klemm.gtn.com>
 # $FreeBSD$
-#
 
 PORTNAME=	tar
 PORTVERSION=	1.26
@@ -32,14 +28,18 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${LDSTATIC}
 CONFIGURE_ENV=	DEFAULT_ARCHIVE=/dev/sa0 \
 		DEFAULT_RMT_COMMAND=/etc/rmt
 
-.if defined(WANT_STATIC)
+OPTIONS_DEFINE=	STATIC
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSTATIC}
 LDSTATIC=	-static
 MAKE_ARGS+=	LIBINTL='$$(LTLIBINTL)' LIBICONV='$$(LTLIBICONV)'
 .else
 LDSTATIC=
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else

Modified: head/archivers/xz/Makefile
==============================================================================
--- head/archivers/xz/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/archivers/xz/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -25,7 +25,9 @@ CONFIGURE_ARGS=	--disable-nls
 # pick up assembly language optimizations
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install install-dist_docDATA install-dist_examplesDATA
 .endif
 

Modified: head/audio/flac/Makefile
==============================================================================
--- head/audio/flac/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/audio/flac/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	flac
-# Date created:		Mar 18, 2001
-# Whom:			Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flac
 PORTVERSION=	1.2.1
@@ -25,7 +21,12 @@ CONFIGURE_ARGS=	--enable-sse \
 CPPFLAGS+=	-I${WRKSRC}/include
 MAKE_JOBS_SAFE=	yes
 
-.if !defined(WITHOUT_ICONV)
+OPTIONS_DEFINE=	ICONV
+OPTIONS_DEFAULT=ICONV
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-libiconv-prefix="${LOCALBASE}"
 .else
@@ -33,10 +34,10 @@ CONFIGURE_ARGS+=--without-libiconv-prefi
 .endif
 
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	DOC=""
-.else
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	DOC=doc
+.else
+MAKE_ENV+=	DOC=""
 .endif
 
 USE_LDCONFIG=	yes

Modified: head/audio/libogg/Makefile
==============================================================================
--- head/audio/libogg/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/audio/libogg/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libogg
-# Date created:				18 October 2000
-# Whom:					t.vanklaveren@student.utwente.nl
-#
+# Created by: t.vanklaveren@student.utwente.nl
 # $FreeBSD$
-#
 
 PORTNAME=	libogg
 PORTVERSION=	1.3.0
@@ -20,10 +16,12 @@ USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-.if defined(NOPORTDOCS)
-MAKE_ENV=	DOC=""
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV=	DOC=doc
+.else
+MAKE_ENV=	DOC=""
 .endif
 
 regression-test: build

Modified: head/audio/libvorbis/Makefile
==============================================================================
--- head/audio/libvorbis/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/audio/libvorbis/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libvorbis
-# Date created:				18 October 2000
-# Whom:					t.vanklaveren@student.utwente.nl
-#
+# Created by: t.vanklaveren@student.utwente.nl
 # $FreeBSD$
-#
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.3.3
@@ -27,10 +23,12 @@ CONFIGURE_ARGS=	--with-ogg=${LOCALBASE} 
 		--disable-docs		# don't rebuild
 MAKE_JOBS_SAFE=	yes
 
-.if defined(NOPORTDOCS)
-MAKE_ENV=	DOC=""
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV=	DOC=doc
+.else
+MAKE_ENV=	DOC=""
 .endif
 
 regression-test: build

Modified: head/audio/vorbis-tools/Makefile
==============================================================================
--- head/audio/vorbis-tools/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/audio/vorbis-tools/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	vorbis-tools
-# Date created:				18 October 2000
-# Whom:					t.vanklaveren@student.utwente.nl
-#
+# Created by: t.vanklaveren@student.utwente.nl
 # $FreeBSD$
-#
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.4.0
@@ -29,7 +25,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=    yes
 PLIST_SUB+=     NLS=""
 .else

Modified: head/audio/xmms-shn/Makefile
==============================================================================
--- head/audio/xmms-shn/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/audio/xmms-shn/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   shntool
-# Date created:        2 November 2000
-# Whom:                Bill Fenner <fenner@FreeBSD.Org>
-#
+# Created by: Bill Fenner <fenner@FreeBSD.Org>
 # $FreeBSD$
-#
 
 PORTNAME=	xmms-shn
 PORTVERSION=	2.4.1
@@ -21,8 +17,10 @@ USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif

Modified: head/audio/xmms-xf86audio/Makefile
==============================================================================
--- head/audio/xmms-xf86audio/Makefile	Tue Dec 18 20:29:43 2012	(r309199)
+++ head/audio/xmms-xf86audio/Makefile	Tue Dec 18 21:29:04 2012	(r309200)
@@ -12,10 +12,12 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimed
 
 MAKE_ARGS=	CC="${CC}" OPT="${CFLAGS}" DEBUG=""
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libxf86audio.so \
 		`xmms-config --general-plugin-dir`
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212182129.qBILT4LM032919>