Date: Sat, 29 Dec 2012 21:00:01 GMT From: dfilter@FreeBSD.ORG (dfilter service) To: gnome@FreeBSD.org Subject: Re: ports/173788: commit references a PR Message-ID: <201212292100.qBTL01rb032729@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/173788; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/173788: commit references a PR Date: Sat, 29 Dec 2012 20:57:30 +0000 (UTC) Author: mezz Date: Sat Dec 29 20:57:20 2012 New Revision: 309632 URL: http://svnweb.freebsd.org/changeset/ports/309632 Log: -Update to new header -OPTIONSng -Remove the shared library version -portlint PR: ports/173788 ports/173809 ports/173802 Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> Modified: head/archivers/file-roller/Makefile (contents, props changed) head/audio/goobox/Makefile (contents, props changed) head/audio/libcanberra/Makefile (contents, props changed) Modified: head/archivers/file-roller/Makefile ============================================================================== --- head/archivers/file-roller/Makefile Sat Dec 29 20:30:36 2012 (r309631) +++ head/archivers/file-roller/Makefile Sat Dec 29 20:57:20 2012 (r309632) @@ -1,10 +1,6 @@ -# New ports collection makefile for: fileroller -# Date created: 18 May 2002 -# Whom: Anders Nordby <anders@FreeBSD.org> -# +# Created by: Anders Nordby <anders@FreeBSD.org> # $FreeBSD$ # $MCom: ports/archivers/file-roller/Makefile,v 1.184 2010/11/15 22:58:48 kwm Exp $ -# PORTNAME= file-roller PORTVERSION= 2.32.1 @@ -17,8 +13,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc -OPTIONS= NAUTILUS "Enable Nautilus extension" on - RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip @@ -40,14 +34,19 @@ CONFIGURE_ARGS= --disable-packagekit PORTDOCS= AUTHORS NEWS README TODO ChangeLog GCONF_SCHEMAS= file-roller.schemas -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS NAUTILUS +NAUTILUS_DESC= Enable Nautilus extension + +OPTIONS_DEFAULT=NAUTILUS + +.include <bsd.port.options.mk> -.if !defined(WITHOUT_NAUTILUS) +.if ${PORT_OPTIONS:MNAUTILUS} USE_GNOME+= nautilus2 PLIST_SUB+= NAUTILUS="" .else PLIST_SUB+= NAUTILUS="@comment " -CONFIGURE_ARGS+= --disable-nautilus-actions +CONFIGURE_ARGS+=--disable-nautilus-actions .endif post-patch: @@ -57,11 +56,11 @@ post-patch: post-install: @-update-desktop-database -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/goobox/Makefile ============================================================================== --- head/audio/goobox/Makefile Sat Dec 29 20:30:36 2012 (r309631) +++ head/audio/goobox/Makefile Sat Dec 29 20:57:20 2012 (r309632) @@ -1,10 +1,6 @@ -# New ports collection makefile for: guikachu -# Date created: 11 Nov 2004 -# Whom: Alexander Nedotsukov <bland@FreeBSD.org> -# +# Created by: Alexander Nedotsukov <bland@FreeBSD.org> # $FreeBSD$ # $MCom: ports/audio/goobox/Makefile,v 1.25 2007/08/15 03:03:09 mezz Exp $ -# PORTNAME= goobox PORTVERSION= 2.2.0 @@ -17,10 +13,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= CD player and ripper for GNOME Desktop environment BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= discid.0:${PORTSDIR}/audio/libdiscid \ - musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ - brasero-media.3:${PORTSDIR}/sysutils/brasero \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS= discid:${PORTSDIR}/audio/libdiscid \ + musicbrainz3:${PORTSDIR}/audio/libmusicbrainz3 \ + brasero-media:${PORTSDIR}/sysutils/brasero \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_XORG= x11 @@ -37,18 +33,19 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= goobox.schemas -OPTIONS= NOTIFY "Enable libnotify support" on +OPTIONS_DEFINE= NOTIFY +OPTIONS_DEFAULT=NOTIFY -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify -CONFIGURE_ARGS+= --enable-notification +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +CONFIGURE_ARGS+=--enable-notification .else -CONFIGURE_ARGS+= --disable-notification +CONFIGURE_ARGS+=--disable-notification .endif post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/libcanberra/Makefile ============================================================================== --- head/audio/libcanberra/Makefile Sat Dec 29 20:30:36 2012 (r309631) +++ head/audio/libcanberra/Makefile Sat Dec 29 20:57:20 2012 (r309632) @@ -1,7 +1,4 @@ -# New ports collection makefile for: libcanberra -# Date created: 05 August 2008 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/audio/libcanberra/Makefile,v 1.28 2011/06/11 18:55:56 mezz Exp $ @@ -14,10 +11,11 @@ MASTER_SITES= http://0pointer.de/lennart MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the Freedesktop sound theme spec -LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis - LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL + +LIB_DEPENDS= vorbisfile:${PORTSDIR}/audio/libvorbis + USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2 USE_LDCONFIG= yes @@ -28,31 +26,30 @@ LDFLAGS+= -L${LOCALBASE}/lib .if !defined(SLAVEPORT) GCONF_SCHEMAS= libcanberra.schemas - -OPTIONS= PULSE "Enable Pulse Audio support" off \ - GSTREAMER "Enable GStreamer audio support" off +.else +OPTIONS_DEFINE= PULSEAUDIO GSTREAMER .endif PLIST_SUB= VERSION=${PORTVERSION} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(SLAVEPORT) USE_GNOME+= gtk30 -LIB_DEPENDS+= canberra.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS+= canberra:${PORTSDIR}/audio/libcanberra CONFIGURE_ARGS+=--enable-gtk3 .else CONFIGURE_ARGS+=--disable-gtk3 -.if !defined(WITHOUT_PULSE) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio PLIST_SUB+= PULSE="" .else CONFIGURE_ARGS+=--disable-pulse PLIST_SUB+= PULSE="@comment " .endif -.if !defined(WITHOUT_GSTREAMER) +.if ${PORT_OPTIONS:MGSTREAMER} USE_GSTREAMER= yes PLIST_SUB+= GSTREAMER="" .else @@ -66,4 +63,4 @@ post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212292100.qBTL01rb032729>