svn commit: r307473 - in head: x11-toolkits/nucleo x11/metisse

Alexey Dokuchaev danfe at FreeBSD.org
Fri Nov 16 06:42:39 UTC 2012 

Author: danfe
Date: Fri Nov 16 06:42:38 2012
New Revision: 307473
URL: http://svnweb.freebsd.org/changeset/ports/307473

Log:
  - Trim Makefile header per new bylaws
  - Convert to the new OPTIONS framework
  - Remove explicit shlib versions from LIB_DEPENDS
  - Relinquish maintainership
  
  Feature safe:	yes

Modified:
  head/x11-toolkits/nucleo/Makefile
  head/x11/metisse/Makefile

Modified: head/x11-toolkits/nucleo/Makefile
==============================================================================
--- head/x11-toolkits/nucleo/Makefile	Fri Nov 16 06:37:57 2012	(r307472)
+++ head/x11-toolkits/nucleo/Makefile	Fri Nov 16 06:42:38 2012	(r307473)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	The nucleo toolkit
-# Date created:				30 May 2007
-# Whom:					Alexey Dokuchaev <danfe at FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	nucleo
 PORTVERSION=	0.7.6
@@ -11,15 +7,15 @@ PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 
-MAINTAINER=	danfe at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Toolkit to explore video and human-computer interaction
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
+		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		exif.12:${PORTSDIR}/graphics/libexif
+		exif:${PORTSDIR}/graphics/libexif
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -29,11 +25,12 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-OPTIONS=	GNUTLS	"Build with GnuTLS support"	off \
-		DNSSD	"Build with DNS-SD support"	off \
-		FFMPEG	"Enable FFmpeg plugin"		off \
-		QT4	"Enable Qt4 plugin"		off \
-		GD	"Enable GD plugin"		off
+OPTIONS_DEFINE=	GNUTLS DNSSD FFMPEG QT4 GD
+
+DNSSD_DESC=	DNS-SD support
+FFMPEG_DESC=	FFmpeg plugin
+QT4_DESC=	Qt4 plugin
+GD_DESC=	GD plugin
 
 .include <bsd.port.pre.mk>
 
@@ -41,31 +38,31 @@ OPTIONS=	GNUTLS	"Build with GnuTLS suppo
 BROKEN=		Does not compile on powerpc-9
 .endif
 
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
-.if defined(WITH_DNSSD)
+.if ${PORT_OPTIONS:MDNSSD}
 .  if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h)
-LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/avahi-libdns
+LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/avahi-libdns
 .  else
-LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 .  endif
 .else
 CONFIGURE_ARGS+=	--without-dns-sd
 .endif
 
-.if defined(WITH_FFMPEG)
-LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg
+.if ${PORT_OPTIONS:MFFMPEG}
+LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=	--without-ffmpeg
 PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT4=	moc_build corelib
 MAKE_ARGS+=	QT4MOC=${LOCALBASE}/bin/moc-qt4
 PLIST_SUB+=	QT4=""
@@ -74,8 +71,8 @@ CONFIGURE_ARGS+=	--without-qt
 PLIST_SUB+=	QT4="@comment "
 .endif
 
-.if defined(WITH_GD)
-LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+.if ${PORT_OPTIONS:MGD}
+LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
 PLIST_SUB+=	GD=""
 .else
 CONFIGURE_ARGS+=	--without-gd

Modified: head/x11/metisse/Makefile
==============================================================================
--- head/x11/metisse/Makefile	Fri Nov 16 06:37:57 2012	(r307472)
+++ head/x11/metisse/Makefile	Fri Nov 16 06:42:38 2012	(r307473)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Metisse
-# Date created:				31 May 2007
-# Whom:					Alexey Dokuchaev <danfe at FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	metisse
 PORTVERSION=	0.4.1
@@ -11,14 +7,14 @@ PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/metisse/
 
-MAINTAINER=	danfe at FreeBSD.org
-COMMENT=	An innovative X-based window system
+MAINTAINER=	ports at FreeBSD.org
+COMMENT=	Innovative X-based window system
 
 LICENSE=	GPLv3
 
 CONFLICTS=	fvwm-1.* fvwm-2.5.*
 
-LIB_DEPENDS=	Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo \
+LIB_DEPENDS=	Nucleo:${PORTSDIR}/x11-toolkits/nucleo \
 		png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
 
@@ -34,59 +30,59 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_XORG=	xcursor xft xinerama xpm xrender xt xtst
 
-OPTIONS=	MMX	"Enable MMX optimizations"		on \
-		GLX	"Enable GLX extension"			on \
-		GLX_X86	"Build GLX with x86 optimizations"	on \
-		ATSPI	"Enable widget tracking support"	off \
-		STROKE	"Enable support for mouse gestures"	off \
-		RPLAY	"Enable RPlay support in FvwmEvent"	off \
-		BIDI	"Enable bi-directional text support"	off \
-		GLIB	"Use GLib 2.x for module integration"	off \
-		GTK2	"Use GDK-PixBuf-2.0 for image loading"	off \
-		GCONF	"Enable GConf/Glade configuration UI"	off \
-		GTK1	"Enable legacy GTK+ 1.2.x support"	off \
-		IMLIB	"Enable Imlib support in FvwmGtk"	off \
-		GNOME	"Enable legacy GNOME 1.4 support"	off
+OPTIONS_DEFINE=	MMX GLX GLX_X86 ATSPI STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \
+		GTK1 IMLIB GNOME
+
+GLX_X86_DESC=	GLX with x86 optimizations
+ATSPI_DESC=	Widget tracking support
+RPLAY_DESC=	Enable RPlay support in FvwmEvent
+GLIB_DESC=	Use GLib 2.x for module integration
+GTK2_DESC=	Use GDK-PixBuf-2.0 for image loading
+GTK1_DESC=	Legacy GTK+ 1.2.x support
+IMLIB_DESC=	Imlib support in FvwmGtk
+GNOME_DESC=	Legacy GNOME 1.4 support
+
+OPTIONS_DEFAULT=	MMX GLX GLX_X86
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_CPU:Mmmx} && !defined(WITHOUT_MMX)
+.if ${MACHINE_CPU:Mmmx} && ${PORT_OPTIONS:MMMX}
 CONFIGURE_ARGS+=	--enable-mmx
 .endif
 
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MGLX}
 CONFIGURE_ARGS+=	--enable-glx
 .endif
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_GLX_X86)
+.if ${ARCH} == "i386" && ${PORT_OPTIONS:MGLX_X86}
 CONFIGURE_ARGS+=	--enable-glx-x86
 .endif
 
-.if defined(WITH_ATSPI)
+.if ${PORT_OPTIONS:MATSPI}
 USE_GNOME+=	atspi
 .endif
 
-.if defined(WITH_STROKE)
-LIB_DEPENDS+=	stroke.0:${PORTSDIR}/devel/libstroke
+.if ${PORT_OPTIONS:MSTROKE}
+LIB_DEPENDS+=	stroke:${PORTSDIR}/devel/libstroke
 .endif
 
-.if defined(WITH_RPLAY)
-LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
+.if ${PORT_OPTIONS:MRPLAY}
+LIB_DEPENDS+=	rplay:${PORTSDIR}/audio/rplay
 .endif
 
-.if defined(WITH_BIDI)
-LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
+.if ${PORT_OPTIONS:MFRIBIDI}
+LIB_DEPENDS+=	fribidi:${PORTSDIR}/converters/fribidi
 .endif
 
-.if ${HAVE_GNOME:Mglib20} || defined(WITH_GLIB)
+.if ${HAVE_GNOME:Mglib20} || ${PORT_OPTIONS:MGLIB}
 USE_GNOME+=	glib20
 .endif
 
-.if ${HAVE_GNOME:Mgtk20} || defined(WITH_GTK2)
+.if ${HAVE_GNOME:Mgtk20} || ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 .endif
 
-.if ${HAVE_GNOME:Mgconf2} && ${HAVE_GNOME:Mlibglade2} || defined(WITH_GCONF)
+.if ${HAVE_GNOME:Mgconf2} && ${HAVE_GNOME:Mlibglade2} || ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=	gconf2 libglade2
 PLIST_SUB+=	GCONF=""
 .else
@@ -94,15 +90,15 @@ _NOGLADEDIR=	yes
 PLIST_SUB+=	GCONF="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mgtk12} || defined(WITH_GTK1)
+.if ${HAVE_GNOME:Mgtk12} || ${PORT_OPTIONS:MGTK1}
 USE_GNOME+=	gtk12
 .endif
 
-.if ${HAVE_GNOME:Mimlib} || defined(WITH_IMLIB)
+.if ${HAVE_GNOME:Mimlib} || ${PORT_OPTIONS:MIMLIB}
 USE_GNOME+=	imlib
 .endif
 
-.if ${HAVE_GNOME:Mgnomelibs} || defined(WITH_GNOME)
+.if ${HAVE_GNOME:Mgnomelibs} || ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	gnomelibs
 .endif

More information about the svn-ports-all mailing list