From owner-svn-ports-all@FreeBSD.ORG Tue Dec 18 21:29:06 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6D0E4C2; Tue, 18 Dec 2012 21:29:06 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 897D88FC12; Tue, 18 Dec 2012 21:29:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBILT6Uk032928; Tue, 18 Dec 2012 21:29:06 GMT (envelope-from naddy@svn.freebsd.org) Received: (from naddy@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBILT4LM032919; Tue, 18 Dec 2012 21:29:04 GMT (envelope-from naddy@svn.freebsd.org) Message-Id: <201212182129.qBILT4LM032919@svn.freebsd.org> From: Christian Weisgerber Date: Tue, 18 Dec 2012 21:29:04 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Dec 2012 21:29:06 -0000 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 + +.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 -# +# Created by: Andreas Klemm # $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 + +.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 + +.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 -# +# Created by: Ying-Chieh Liao # $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 + +.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 + +.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 + +.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 + +.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 -# +# Created by: Bill Fenner # $FreeBSD$ -# PORTNAME= xmms-shn PORTVERSION= 2.4.1 @@ -21,8 +17,10 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes +.include + 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 + 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