diff options
47 files changed, 680 insertions, 854 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index f69f440613a3..003a9a16b68b 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: gnomemedia2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/audio/gnome-media/Makefile,v 1.155 2010/09/29 08:17:11 kwm Exp $ -# +# $MCom: ports/audio/gnome-media/Makefile,v 1.164 2012/09/01 23:02:08 mezz Exp $ PORTNAME= gnome-media PORTVERSION= 2.32.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,6 +16,8 @@ BUILD_DEPENDS= xml2po:${PORTSDIR}/textproc/gnome-doc-utils LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +CONFLICTS= gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes @@ -27,8 +25,8 @@ INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2 +USES= pathfix +USE_GNOME= gnomeprefix intlhack gtk20 libxml2 gconf2 USE_GSTREAMER= gconf good CONFIGURE_ARGS= --disable-gstmix CPPFLAGS+= -I${LOCALBASE}/include @@ -37,12 +35,13 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gnome-audio-profiles.schemas \ gnome-sound-recorder.schemas -OPTIONS= PULSEAUDIO "Enable Pulse Audio support" on +OPTIONS_DEFINE= PULSEAUDIO +OPTIONS_DEFAULT=PULSEAUDIO -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_PULSEAUDIO) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+=--enable-pulseaudio PLIST_SUB+= PULSE="" .else @@ -54,4 +53,4 @@ post-patch: @${REINPLACE_CMD} -e 's|have_gladeui=true|have_gladeui=false|g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 43dde05a793c..a9df23fba152 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.203 2010/11/15 17:19:55 kwm Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.218 2013/03/09 09:12:37 kwm Exp $ PORTNAME= evolution-data-server PORTVERSION= 2.32.1 @@ -18,7 +18,6 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ ical:${PORTSDIR}/devel/libical \ nss3:${PORTSDIR}/security/nss \ tasn1:${PORTSDIR}/security/libtasn1 \ - sqlite3:${PORTSDIR}/databases/sqlite3 \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring USE_BZIP2= yes @@ -28,6 +27,7 @@ USE_GETTEXT= yes USE_GNOME= gnomeprefix intlhack ltverhack ltasneededhack gconf2 \ libxml2 USE_OPENLDAP= yes +USE_SQLITE= 3 USE_AUTOTOOLS= libtool USE_BDB= 41+ USE_LDCONFIG= yes @@ -40,26 +40,19 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2" -#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off -OPTIONS= WEATHER "Enable weather calendar backend" on \ - KERBEROS "Adds Kerberos support" on +OPTIONS_DEFINE= WEATHER KERBEROS +OPTIONS_DEFAULT=WEATHER KERBEROS +WEATHER_DESC= Weather calendar backend -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_KERBEROS) +.if ${PORT_OPTIONS:MKERBEROS} CONFIGURE_ARGS+= --with-krb5=/usr KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif -#.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING) -#CONFIGURE_ARGS+= --enable-imap4=yes -#PLIST_SUB+= IMAP4="" -#.else -PLIST_SUB+= IMAP4="@comment " -#.endif - -.if defined(WITH_WEATHER) -LIB_DEPENDS+= gweather.1:${PORTSDIR}/net/libgweather +.if ${PORT_OPTIONS:MWEATHER} +LIB_DEPENDS+= gweather:${PORTSDIR}/net/libgweather CONFIGURE_ARGS+= --with-weather PLIST_SUB+= WEATHER="" .else @@ -83,4 +76,4 @@ post-patch: s|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile index 77bb3e9a54f6..170d5e80c0f8 100644 --- a/deskutils/conduit/Makefile +++ b/deskutils/conduit/Makefile @@ -1,6 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/deskutils/conduit/Makefile,v 1.7 2008/03/18 14:53:42 ahze Exp $ + PORTNAME= conduit PORTVERSION= 0.3.17 PORTREVISION= 6 @@ -32,17 +33,20 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= pygnome2 gnomeprefix -OPTIONS= NAUTILUS "Enable Nautilus Plugin" On \ - EOG "Enable Eye-Of-Gnome Plugin" On -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= NAUTILUS EOG +OPTIONS_DEFAULT=NAUTILUS EOG +NAUTILUS_DESC= Build Nautilus Plugin +EOG_DESC= Build Eye-Of-Gnome Plugin + +.include <bsd.port.options.mk> -.if defined(WITH_NAUTILUS) +.if ${PORT_OPTIONS:MNAUTILUS} USE_GNOME+= nautilus2 CONFIGURE_ARGS+= --enable-nautilus-extension .endif -.if defined(WITH_EOG) +.if ${PORT_OPTIONS:MEOG} BUILD_DEPENDS+= eog:${PORTSDIR}/graphics/eog RUN_DEPENDS+= eog:${PORTSDIR}/graphics/eog CONFIGURE_ARGS+= --enable-eog-plugin @@ -55,4 +59,4 @@ post-patch: -e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \ -e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|' -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index 88cccc7dc605..93b695c59e78 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: nautilus-sendto -# Date created: 2004-12-03 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.30 2010/09/30 06:21:18 kwm Exp $ @@ -19,37 +16,37 @@ GLIB_SCHEMAS= org.gnome.Nautilus.Sendto.gschema.xml USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= intlhack gnomeprefix nautilus2 gnomehack \ - evolutiondataserver -GNOME_DESKTOP_VERSION=2 +USES= pathfix +USE_GNOME= intlhack gnomeprefix nautilus2 gnomehack evolutiondataserver USE_GETTEXT= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-plugins="${SENDTO_PLUGINS}" -OPTIONS= PIDGIN "Build pidgin sendto plugin" off \ - UPNP "Build upnp sendto plugin" off +OPTIONS_DEFINE= PIDGIN UPNP +PIDGIN_DESC= Build pidgin sendto plugin +UPNP_DESC= Build upnp sendto plugin # check configure script for allowed_plugins="..." for new plugins SENDTO_PLUGINS= evolution gajim nautilus-burn removable-devices -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PIDGIN) +.if ${PORT_OPTIONS:MPIDGIN} SENDTO_PLUGINS:=${SENDTO_PLUGINS} pidgin -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS+= pidgin:${PORTSDIR}/net-im/pidgin PLIST_SUB+= PIDGIN="" .else PLIST_SUB+= PIDGIN="@comment " .endif -.if defined(WITH_UPNP) +.if ${PORT_OPTIONS:MUPNP} SENDTO_PLUGINS:=${SENDTO_PLUGINS} upnp -LIB_DEPENDS+= gupnp-1.0:${PORTSDIR}/net/gupnp +LIB_DEPENDS+= gupnp-1:${PORTSDIR}/net/gupnp PLIST_SUB+= UPNP="" .else PLIST_SUB+= UPNP="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 705ecd202172..cb5c7be70e6c 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: Planner -# Date created: 15 July 2001 -# Whom: Dmitry Sivachenko <demon@FreeBSD.org> -# +# Created by: Dmitry Sivachenko <demon@FreeBSD.org> # $FreeBSD$ # $MCom: ports-stable/deskutils/planner/Makefile,v 1.4 2009/04/16 00:34:24 kwm Exp $ -# PORTNAME= planner PORTVERSION= 0.14.6 @@ -18,7 +14,8 @@ COMMENT= Project management application for GNOME 2 USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \ +USES= pathfix +USE_GNOME= gnomeprefix intlhack libgnomeui libgnomeprintui \ libgsf desktopfileutils WANT_GNOME= yes USE_GETTEXT= yes @@ -36,13 +33,13 @@ GCONF_SCHEMAS= planner.schemas MAN1= planner.1 -OPTIONS= GDA "Enable database support (though libgda)" off +OPTIONS_DEFINE= GDA +GDA_DESC= Enable database support (though libgda) # EVO "Enable evolution data server support" off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> - -.if defined(WITH_GDA) +.if ${PORT_OPTIONS:MGDA} USE_GNOME+= libgda3 CONFIGURE_ARGS+=--with-database=gda3 PLIST_SUB+= GDA="" @@ -50,15 +47,7 @@ PLIST_SUB+= GDA="" PLIST_SUB+= GDA="@comment " .endif -#.if defined(WITH_EVO) -#USE_GNOME+= evolutiondataserver -#CONFIGURE_ARGS+=--enable-eds --enable-eds-backend -#PLIST_SUB+= EVO="" -#.else -PLIST_SUB+= EVO="@comment " -#.endif - post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index c7e0d4fa9160..5bcc8b205e90 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: anjuta -# Date created: 31 March 2001 -# Whom: Dmitry Sivachenko <demon@FreeBSD.org> -# +# Created by: Dmitry Sivachenko <demon@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.67 2010/11/13 08:07:29 kwm Exp $ -# +# $MCom: ports/devel/anjuta/Makefile,v 1.72 2012/12/13 20:33:05 kwm Exp $ PORTNAME= anjuta PORTVERSION= 2.32.1.1 @@ -19,10 +15,10 @@ COMMENT= Integrated Development Environment for C and C++ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ bash:${PORTSDIR}/shells/bash \ p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext -LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre \ - gladeui-1.10:${PORTSDIR}/devel/glade3 \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - gdl-1.3:${PORTSDIR}/x11-toolkits/gdl +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \ + gladeui-1:${PORTSDIR}/devel/glade3 \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + gdl-1:${PORTSDIR}/x11-toolkits/gdl RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ autogen:${PORTSDIR}/devel/autogen \ ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \ @@ -32,6 +28,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ gdb66:${PORTSDIR}/devel/gdb66 \ yelp:${PORTSDIR}/x11/yelp +CONFLICTS= anjuta-3.[0-9]* + USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes @@ -62,16 +60,17 @@ GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ MAN1= anjuta.1 anjuta-launcher.1 -OPTIONS= SVN "Build subversion plugin" off \ - DEVHELP "Build devhelp plugin" on \ - GRAPHVIZ "Build inheritance plugin" on +OPTIONS_DEFINE= SVN DEVHELP GRAPHVIZ +OPTIONS_DEFAULT=DEVHELP GRAPHVIZ +DEVHELP_DESC= Devhelp support +GRAPHVIZ_DESC= inheritance plugin -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SVN) +.if ${PORT_OPTIONS:MSVN} BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion -LIB_DEPENDS+= apr-1.4:${PORTSDIR}/devel/apr1 -LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 +LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 +LIB_DEPENDS+= neon:${PORTSDIR}/www/neon29 RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion PLIST_SUB+= SVN="" .else @@ -79,8 +78,8 @@ CONFIGURE_ARGS+=--disable-plugin-subversion PLIST_SUB+= SVN="@comment " .endif -.if defined(WITH_DEVHELP) -LIB_DEPENDS+= devhelp-2.1:${PORTSDIR}/devel/devhelp +.if ${PORT_OPTIONS:MDEVHELP} +LIB_DEPENDS+= devhelp-2:${PORTSDIR}/devel/devhelp PLIST_SUB+= DEVHELP="" .else CONFIGURE_ARGS+=--disable-plugin-devhelp @@ -90,7 +89,7 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp PLIST_SUB+= DEVHELP="" .endif -.if defined(WITH_GRAPHVIZ) +.if ${PORT_OPTIONS:MGRAPHVIZ} CONFIGURE_ARGS+=--enable-graphviz BUILD_DEPENDS+= neato:${PORTSDIR}/graphics/graphviz RUN_DEPENDS+= neato:${PORTSDIR}/graphics/graphviz @@ -111,7 +110,7 @@ post-configure: ${WRKSRC}/plugins/symbol-db/symbol-db-prefs.h post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \ doc/ScintillaDoc.html TODO @@ -120,4 +119,4 @@ post-install: .endif @-update-mime-database ${PREFIX}/share/mime -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index eb7ea57a2739..220d19ed4556 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,13 +1,10 @@ -# New ports collection makefile for: devhelp -# Date created: 29 May 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/devhelp/Makefile,v 1.38 2010/09/28 09:09:20 kwm Exp $ +# $MCom: ports/devel/devhelp/Makefile,v 1.45 2012/09/01 23:02:09 mezz Exp $ PORTNAME= devhelp PORTVERSION= 2.32.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -16,40 +13,44 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Developer help browser for GNOME 2 -LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique + +CONFLICTS= devhelp-3.[0-9]* USE_BZIP2= yes USE_XORG= x11 USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck +USES= pathfix +USE_GNOME= intlhack gnomeprefix libgnomeui libwnck USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes GCONF_SCHEMAS= devhelp.schemas -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -OPTIONS= GEDIT "Enable GEdit plug-in support" off +OPTIONS_DEFINE= GEDIT +GEDIT_DESC= Enable GEdit plug-in support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GEDIT) -BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit -RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit +.if ${PORT_OPTIONS:MGEDIT} +BUILD_DEPENDS+= gedit<3.0.0:${PORTSDIR}/editors/gedit +RUN_DEPENDS+= gedit<3.0.0:${PORTSDIR}/editors/gedit PLIST_SUB+= GEDIT="" .else PLIST_SUB+= GEDIT="@comment " .endif post-patch: -.if defined(WITHOUT_GEDIT) +.if ! ${PORT_OPTIONS:MGEDIT} @${REINPLACE_CMD} -e 's|gedit-plugin||' \ ${WRKSRC}/misc/Makefile.in @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_SINGLE_INCLUDES||g' \ ${WRKSRC}/src/Makefile.in .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index f89b14f1afc2..417886e1a3aa 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gconf2 -# Date created: 28th June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# +# Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/gconf2/Makefile,v 1.124 2010/11/15 22:14:03 kwm Exp $ -# PORTNAME= gconf2 PORTVERSION= 2.32.0 @@ -25,12 +21,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING .if !defined(REFERENCE_PORT) -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ +USES= pathfix +USE_GNOME= gnomehier orbit2 gtk20 libxml2 ltverhack \ referencehack intlhack dconf USE_LDCONFIG= yes USE_AUTOTOOLS= libtool @@ -43,11 +40,11 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= gconftool-2.1 gsettings-data-convert.1 \ gsettings-schema-convert.1 -OPTIONS= LDAP "Enable LDAP support" off +OPTIONS_DEFINE= LDAP -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-openldap PLIST_SUB+= LDAP="" @@ -59,6 +56,6 @@ PLIST_SUB+= LDAP="@comment " post-install: -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index fe9179e9be11..19a901af3f82 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: glade2 -# Date created: 02 June 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/glade2/Makefile,v 1.20 2007/08/04 03:51:29 marcus Exp $ -# PORTNAME= glade PORTVERSION= 2.12.2 @@ -23,28 +19,25 @@ USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk20 desktopfileutils +USES= pathfix +USE_GNOME= gnomeprefix intlhack gtk20 desktopfileutils USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= GNOME "Enable gnome support" on #\ -# GNOMEDB "Enable libgnomedb support" off +OPTIONS_DEFINE= GNOME +OPTIONS_DEFAULT=GNOME +GNOME_DESC= Gnome support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_GNOME) -CONFIGURE_ARGS+= --disable-gnome -.else +.if ${PORT_OPTIONS:MGNOME} USE_GNOME+= libgailgnome libgnomeui CONFIGURE_ARGS+= --enable-gnome +.else +CONFIGURE_ARGS+= --disable-gnome .endif -#.if defined(WITH_GNOMEDB) -#USE_GNOME+= libgnomedb -#CONFIGURE_ARGS+= --enable-gnome-db -#.else CONFIGURE_ARGS+= --disable-gnome-db -#.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 71a93666a3b1..68eb29059d1c 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomevfs2 -# Date created: 28th June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# +# Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/gnome-vfs/Makefile,v 1.191 2010/09/29 12:30:29 kwm Exp $ -# PORTNAME= gnome-vfs PORTVERSION= 2.24.4 @@ -24,7 +20,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomemimedata gconf2 \ ltverhack referencehack USE_AUTOTOOLS= libtool USE_OPENSSL= yes @@ -44,11 +41,12 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas -OPTIONS= SAMBA "Enable SMB volume support" on \ - MDNS "Enable Bonjour/Rendezvous support" on \ - HAL "Enable HAL support" on +OPTIONS_DEFINE= SAMBA MDNS HAL +OPTIONS_DEFAULT=SAMBA MDNS HAL +SAMBA_DESC= Enable SMB volume support +MDNS_DESC= Enable Bonjour/Rendezvous support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) USE_FAM= yes @@ -58,22 +56,22 @@ USE_FAM= yes LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal .endif -.if !defined(WITHOUT_HAL) +.if ${PORT_OPTIONS:MHAL} CONFIGURE_ARGS+=--enable-hal -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal .else CONFIGURE_ARGS+=--disable-hal .endif -.if !defined(WITHOUT_SAMBA) -LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +.if ${PORT_OPTIONS:MSAMBA} +LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else PLIST_SUB+= SAMBA="@comment " CONFIGURE_ARGS+=--disable-samba .endif -.if !defined(WITHOUT_MDNS) +.if ${PORT_OPTIONS:MMDNS} LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app .else CONFIGURE_ARGS+=--disable-avahi @@ -103,6 +101,6 @@ pre-configure: post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index c35ccb33e9ba..9c4ac1599bd2 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libglade2 -# Date created: 18 August 1999 -# Whom: Ade Lovett <ade@lovett.com> -# +# Created by: Ade Lovett <ade@lovett.com> # $FreeBSD$ # $MCom: ports/devel/libglade2/Makefile,v 1.26 2007/08/01 16:13:48 mezz Exp $ -# PORTNAME= libglade2 PORTVERSION= 2.6.4 @@ -26,7 +22,8 @@ RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack libxml2 gtk20 referencehack +USES= pathfix +USE_GNOME= libxml2 gtk20 referencehack USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc \ @@ -37,11 +34,12 @@ LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \ CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports" -OPTIONS= PYTHON "Use Python" on +OPTIONS_DEFINE= PYTHON +OPTIONS_DEFAULT=PYTHON .include <bsd.port.options.mk> -.if !defined(WITHOUT_PYTHON) +.if ${PORT_OPTIONS:MPYTHON USE_PYTHON= yes PLIST_SUB+= PYTHON="" diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile index 08db889050bf..95fa4b33dd4b 100644 --- a/devel/ptlib26/Makefile +++ b/devel/ptlib26/Makefile @@ -13,7 +13,7 @@ COMMENT= A cross platform C++ library, used by OPAL LICENSE=MPL -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 CONFLICTS= pwlib-1.* ptlib-2.4.* ptlib-2.8.* @@ -29,43 +29,40 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}" CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" -OPTIONS= ODBC "Use ODBC" Off \ - ALSA "Use ALSA (experimental)" Off \ - V4L "Use Video4Linux" Off \ - BSDVIDEO "Enable BSD video support" On \ - SDL "Use SDL" On \ - LDAP "Enable LDAP support" Off +OPTIONS_DEFINE= ODBC ALSA V4L BSDVIDEO SDL LDAP +OPTIONS_DEFAULT=BSDVIDEO SDL +BSDVIDEO_DESC= BSD video support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> PLIST_SUB+= PORTVERSION=${PORTVERSION} \ PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g} \ PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//} -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= optshared debugshared BROKEN= debug libs install broken .else ALL_TARGET= optshared .endif -.if defined(WITH_ODBC) +.if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+= --enable-odbc -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+= --disable-odbc .endif -.if defined(WITH_ALSA) +.if ${PORT_OPTIONS:MALSA} CONFIGURE_ARGS+= --enable-alsa PLIST_SUB+= ALSA="" -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --disable-alsa PLIST_SUB+= ALSA="@comment " .endif -.if defined(WITH_BSDVIDEO) +.if ${PORT_OPTIONS:MBSDVIDEO} CONFIGURE_ARGS+=--enable-bsdvideo PLIST_SUB+= BSDVIDEO="" WITH_VIDEO=1 @@ -74,7 +71,7 @@ CONFIGURE_ARGS+=--disable-bsdvideo PLIST_SUB+= BSDVIDEO="@comment " .endif -.if defined(WITH_V4L) +.if ${PORT_OPTIONS:MV4L} CONFIGURE_ARGS+=--enable-v4l --enable-v4l2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -87,7 +84,7 @@ CONFIGURE_ARGS+=--disable-v4l PLIST_SUB+= V4L="@comment " .endif -.if defined(WITH_VIDEO) +.if ${PORT_OPTIONS:MVIDEO} CONFIGURE_ARGS+= --enable-video PLIST_SUB+= VIDEODIR="" .else @@ -95,13 +92,13 @@ CONFIGURE_ARGS+= --disable-video PLIST_SUB+= VIDEODIR="@comment " .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl .else CONFIGURE_ARGS+= --disable-sdl .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --enable-openldap --with-ldap-dir="${LOCALBASE}" .else @@ -136,6 +133,8 @@ CONFIGURE_ARGS+= --disable-dc #PLIST_SUB+= DC1394="@comment " #.endif +.include <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in @${REINPLACE_CMD} -e 's|-lasound|-lasound -L${LOCALBASE}/lib|' ${WRKSRC}/plugins/sound_alsa/Makefile diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index a2d254c501da..da9c6f6ff552 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -13,19 +13,20 @@ DIST_SUBDIR= AbiWord MAINTAINER= gnome@FreeBSD.org COMMENT= An open-source, cross-platform WYSIWYG word processor -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ +LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \ png15:${PORTSDIR}/graphics/png \ wv-1.2:${PORTSDIR}/textproc/wv \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - fribidi.3:${PORTSDIR}/converters/fribidi \ - psiconv.10:${PORTSDIR}/converters/psiconv \ - goffice-0.8.8:${PORTSDIR}/devel/goffice + jpeg:${PORTSDIR}/graphics/jpeg \ + fribidi:${PORTSDIR}/converters/fribidi \ + psiconv:${PORTSDIR}/converters/psiconv \ + goffice-0.8:${PORTSDIR}/devel/goffice RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu USE_GMAKE= yes USE_ICONV= yes USE_GETTEXT= yes -USE_GNOME= gnomehack libxml2 gtk20 desktopfileutils librsvg2 +USES= pathfix +USE_GNOME= libxml2 gtk20 desktopfileutils librsvg2 WANT_GNOME= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -40,27 +41,27 @@ PLIST_SUB+= ABIVERSION=${ABIVERSION} MAN1= abiword.1 -OPTIONS= DEBUG "Enable debug" off \ - BOOST "Build with boost" on \ - SPELLCHECK "Enable spell checking support" on \ - CLIPART "Install clipart" on \ - TEMPLATES "Install additional templates" on +OPTIONS_DEFINE= DEBUG BOOST SPELLCHECK CLIPART TEMPLATES +OPTIONS_DEFAULT=BOOST SPELLCHECK CLIPART TEMPLATES +SPELLCHECK_DESC= Spell checking support +CLIPART_DESC= Install clipart +TEMPLATES_DESC= Install additional templates -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug --enable-symbols .endif -.if defined(WITH_BOOST) +.if ${PORT_OPTIONS:MBOOST} CONFIGURE_ARGS+= --with-boost LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs .else CONFIGURE_ARGS+= --without-boost .endif -.if defined(WITH_SPELLCHECK) -LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant +.if ${PORT_OPTIONS:MSPELLCHECK} +LIB_DEPENDS+= enchant:${PORTSDIR}/textproc/enchant CONFIGURE_ARGS+= --enable-spell PLIST_SUB+= DICT="" .else @@ -68,7 +69,7 @@ CONFIGURE_ARGS+= --disable-spell PLIST_SUB+= DICT="@comment " .endif -.if defined(WITH_TEMPLATES) +.if ${PORT_OPTIONS:MTEMPLATES} CONFIGURE_ARGS+= --enable-templates PLIST_SUB+= TEMPLATES="" .else @@ -76,7 +77,7 @@ CONFIGURE_ARGS+= --disable-templates PLIST_SUB+= TEMPLATES="@comment " .endif -.if defined(WITH_CLIPART) +.if ${PORT_OPTIONS:MCLIPART} CONFIGURE_ARGS+= --enable-clipart PLIST_SUB+= CLIPART="" .else @@ -93,4 +94,4 @@ post-install: @${MKDIR} ${PREFIX}/lib/${PORTNAME}-${ABIVERSION}/plugins @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index 7fb8d73f8600..1e4fc89a3d2e 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gedit-plugins -# Date created: 19 September 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ # $MCom: ports/editors/gedit-plugins/Makefile,v 1.48 2010/10/29 14:47:24 kwm Exp $ -# PORTNAME= gedit-plugins PORTVERSION= 2.32.0 @@ -21,12 +17,15 @@ BUILD_DEPENDS= gedit:${PORTSDIR}/editors/gedit \ RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit \ gucharmap:${PORTSDIR}/deskutils/gucharmap +CONFLICTS= gedit-plugins-3.[0-9]* + USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack gnomeprefix intlhack gnomevfs2 +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomevfs2 WANT_GNOME= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -34,18 +33,12 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas \ gedit-drawspaces.schemas -OPTIONS= PYTHON "Build plugins that depend on python" off - -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif +OPTIONS_DEFINE= PYTHON -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes -.include "${PORTSDIR}/Mk/bsd.python.mk" USE_GNOME+= pygtksourceview BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \ ${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus \ @@ -64,4 +57,4 @@ post-patch: @${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 7747de598367..aa1bf25f0794 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: evince -# Date created: 09 January 2005 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.147 2010/09/28 07:27:12 kwm Exp $ -# +# $MCom: ports/graphics/evince/Makefile,v 1.159 2012/09/01 23:02:10 mezz Exp $ PORTNAME= evince PORTVERSION= 2.32.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,11 +13,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ - spectre.1:${PORTSDIR}/print/libspectre +LIB_DEPENDS= poppler-glib:${PORTSDIR}/graphics/poppler-glib \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + spectre:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ yelp:${PORTSDIR}/x11/yelp +CONFLICTS= evince-3.[0-9]* + USE_LDCONFIG= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool @@ -29,7 +28,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_GMAKE= yes INSTALLS_OMF= yes -USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \ +USES= pathfix +USE_GNOME= intlhack gnomeprefix desktopfileutils \ gnomedocutils ltasneededhack gconf2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -43,46 +43,47 @@ PLIST_SUB+= VERSION=2.32 MAN1= evince.1 -OPTIONS= DVI "Enable DVI viewer support" off \ - T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \ - NAUTILUS "Enable Nautilus plugin" on \ - KEYRING "Enable Gnome-Keyring without Nautilus" on \ - DBUS "Enable D-BUS support" on \ - COMICS "Enable comic book archives support" on \ - IMPRESS "Enable Impress presentations support" off \ - DJVU "Enable DJVU support" off - -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DVI T1LIB NAUTILUS KEYRING COMICS IMPRESS DJVU +OPTIONS_DEFAULT=NAUTILUS KEYRING COMICS +DVI_DESC= DVI viewer support +T1LIB_DESC= T1LIB for TYPE1 fonts to DVI (Enables DVI) +NAUTILUS_DESC= Nautilus plugin +KEYRING_DESC= Gnome-Keyring without Nautilus +COMICS_DESC= Comic book archives support +IMPRESS_DESC= Impress presentations support +DJVU_DESC= DJVU support -.if defined(PACKAGE_BUILDING) || exists(${LOCALBASE}/lib/libdbus-glib-1.so) -WITH_DBUS= yes -.endif +.include <bsd.port.options.mk> -.if defined(WITH_DVI) || defined(WITH_T1LIB) || exists(${LOCALBASE}/lib/libkpathsea.a) +.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB} BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base RUN_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base CONFIGURE_ARGS+= --enable-dvi GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas PLIST_SUB+= DVI="" -. if defined(WITH_T1LIB) -LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib +. if defined(WITH_T1LIB) +LIB_DEPENDS+= t1:${PORTSDIR}/devel/t1lib CONFIGURE_ARGS+= --enable-t1lib +. else +CONFIGURE_ARGS+= --disable-t1lib . endif + .else +CONFIGURE_ARGS+= --disable-dvi PLIST_SUB+= DVI="@comment " .endif -.if !defined(WITHOUT_NAUTILUS) +.if ${PORT_OPTIONS:MNAUTILUS} USE_GNOME+= nautilus2 CONFIGURE_ARGS+= --enable-nautilus PLIST_SUB+= NAUTILUS="" .else BUILD_DEPENDS+= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme RUN_DEPENDS+= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -.if !defined(WITHOUT_KEYRING) -LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +.if ${PORT_OPTIONS:MKEYRING} +LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring .else CONFIGURE_ARGS+= --without-keyring .endif @@ -90,7 +91,7 @@ CONFIGURE_ARGS+= --disable-nautilus PLIST_SUB+= NAUTILUS="@comment " .endif -.if defined(WITH_IMPRESS) +.if ${PORT_OPTIONS:MIMPRESS} CONFIGURE_ARGS+= --enable-impress PLIST_SUB+= IMPRESS="" .else @@ -98,7 +99,7 @@ CONFIGURE_ARGS+= --disable-impress PLIST_SUB+= IMPRESS="@comment " .endif -.if defined(WITH_DJVU) +.if ${PORT_OPTIONS:MDJVU} LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre CONFIGURE_ARGS+= --enable-djvu GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas @@ -108,11 +109,7 @@ CONFIGURE_ARGS+= --disable-djvu PLIST_SUB+= DJVU="@comment " .endif -.if !defined(WITHOUT_DBUS) -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -.endif - -.if !defined(WITHOUT_COMICS) +.if ${PORT_OPTIONS:MCOMICS} RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip CONFIGURE_ARGS+= --enable-comics GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas @@ -133,4 +130,4 @@ post-patch: post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index e033715fbd04..a0fa6caba465 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: balsa -# Date created: 02 December 1998 -# Whom: Glenn Johnson <gljohns@bellsouth.net> -# +# Created by: Glenn Johnson <gljohns@bellsouth.net> # $FreeBSD$ # $MCom: ports-stable/mail/balsa/Makefile,v 1.3 2007/12/02 19:18:50 marcus Exp $ -# PORTNAME= balsa PORTVERSION= 2.4.8 @@ -16,12 +12,12 @@ DISTNAME= balsa-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= A mail reader for the GNOME 2 desktop -LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \ - pcre.3:${PORTSDIR}/devel/pcre \ - esmtp.7:${PORTSDIR}/mail/libesmtp \ - gmime-2.4.6:${PORTSDIR}/mail/gmime24 \ +LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell \ + pcre:${PORTSDIR}/devel/pcre \ + esmtp:${PORTSDIR}/mail/libesmtp \ + gmime-2.4:${PORTSDIR}/mail/gmime24 \ gnome-keyring:${PORTSDIR}/security/gnome-keyring \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra + canberra-gtk:${PORTSDIR}/audio/libcanberra USE_GMAKE= yes USE_BZIP2= yes @@ -29,7 +25,8 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PERL5= yes USE_OPENSSL= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \ +USES= pathfix +USE_GNOME= gnomeprefix intlhack libgnomeui gtkhtml3 \ libgnomeprintui USE_GETTEXT= yes USE_AUTOTOOLS= libltdl @@ -45,36 +42,36 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} MAN1= balsa.1 -OPTIONS= LDAP "Enable LDAP support" on \ - GTKSPELL "Spell checking support" on \ - GTKSV "Enable GtkSourceview support" on \ - NOTIFY "Enable libnotify support" on \ - GPG "Enable GnuPG support" off +OPTIONS_DEFINE= LDAP GTKSPELL GTKSV NOTIFY GPG +OPTIONS_DEFAULT=LDAP GTKSPELL GTKSV NOTIFY +GTKSPELL_DESC= Spell checking support +GTKSV_DESC= GtkSourceview support +GPG_DESC= GnuPG support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GPG) -LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme +.if ${PORT_OPTIONS:MGPG} +LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}/bin/gpgme-config .endif -.if !defined(WITHOUT_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap .endif -.if !defined(WITHOUT_GTKSPELL) -LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell +.if ${PORT_OPTIONS:MGTKSPELL} +LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell CONFIGURE_ARGS+=--with-gtkspell .endif -.if !defined(WITHOUT_GTKSV) +.if ${PORT_OPTIONS:MGTKSV} USE_GNOME+= gtksourceview2 CONFIGURE_ARGS+=--with-gtksourceview=2 .endif -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--with-libnotify=yes .else CONFIGURE_ARGS+=--with-libnotify=no @@ -96,4 +93,4 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-D.*_DISABLE_DEPRECATED_SOURCE||g ; s|-D.*_DISABLE_DEPRECATED||g' -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index baaaa9ffe876..7e70f66a34cc 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -52,20 +52,21 @@ EVO_VERSION= 2.32 PLIST_SUB= VERSION=${EVO_VERSION} \ PORTVERSION=2.12 -OPTIONS= LDAP "Enable LDAP support" on \ - CANBERRA "Enable canberra plugin" on \ - SPAMASSASSIN "Enable SpamAssassin spam filtering" off +OPTIONS_DEFINE= LDAP CANBERRA SPAMASSASSIN +OPTIONS_DEFAULT=LDAP CANBERRA +CANBERRA_DESC= Canberra theme audio plugin +SPAMASSASSIN_DESC= SpamAssassin spam filtering -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-openldap=${LOCALBASE} .else CONFIGURE_ARGS+=--with-openldap=no .endif -.if defined(WITH_SPAMASSASSIN) +.if ${PORT_OPTIONS:MSPAMASSASSIN} RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin .endif @@ -80,8 +81,8 @@ CONFIGURE_ARGS+= --with-krb5=/usr KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif -.if defined(WITH_CANBERRA) -LIB_DEPENDS+= canberra-gtk.0:${PORTSDIR}/audio/libcanberra +.if ${PORT_OPTIONS:MCANBERRA} +LIB_DEPENDS+= canberra-gtk:${PORTSDIR}/audio/libcanberra CONFIGURE_ARGS+=--enable-canberra=yes PLIST_SUB+= CANBERRA="" .else @@ -114,4 +115,4 @@ post-patch: ${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c @${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/gnome2-reference/Makefile b/misc/gnome2-reference/Makefile index b7ac021dee00..b44a2c18f9f0 100644 --- a/misc/gnome2-reference/Makefile +++ b/misc/gnome2-reference/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome2-reference -# Date created: 2006-07-24 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/misc/gnome2-reference/Makefile,v 1.9 2008/08/23 18:22:59 mezz Exp $ -# PORTNAME= gnome2-reference PORTVERSION= 2.20 @@ -56,7 +52,6 @@ REF_LIST= accessibility/at-spi-reference \ x11-toolkits/pango-reference \ x11-toolkits/vte-reference -OPTIONS= # empty NO_BUILD= yes REF_LIST_INC= ${.CURDIR}/Makefile.inc diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index 12e00fe833ac..18dc1e58cd81 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: totem-pl-parser -# Date created: 2007-12-04 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.45 2011/02/21 19:10:03 kwm Exp $ -# PORTNAME= totem-pl-parser PORTVERSION= 2.32.3 @@ -17,25 +13,27 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GObject-based library to parse a host of playlist formats BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gmime-2.4.6:${PORTSDIR}/mail/gmime24 \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome +LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \ + soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix glib20 libxml2 intlhack ltverhack +USES= pathfix +USE_GNOME= gnomeprefix glib20 libxml2 intlhack ltverhack USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= QUVI "Enable flash media stream URL support" off +OPTIONS_DEFINE= QUVI +QUVI_DESC= Enable flash media stream URL support .include <bsd.port.options.mk> -.if defined(WITH_QUVI) -LIB_DEPENDS+= quvi.7:${PORTSDIR}/multimedia/libquvi +.if ${PORT_OPTIONS:MQUVI} +LIB_DEPENDS+= quvi:${PORTSDIR}/multimedia/libquvi CONFIGURE_ARGS+=--enable-enable-quvi .else CONFIGURE_ARGS+=--enable-enable-quvi=no diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 7ad7a8f47733..c30fed86752a 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -1,5 +1,3 @@ -# New ports collection makefile for: totem -# Date created: 17 Oct 2002 # Whom: Hendrik Scholz <hendrik@scholz.net> # # $FreeBSD$ @@ -24,12 +22,14 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata +CONFLICTS= totem-3.[0-9]* + USE_PYTHON= yes USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils \ - nautilus2 ltverhack pygtk2 -GNOME_DESKTOP_VERSION=2 +USES= pathfix +USE_GNOME= gnomeprefix intlhack desktopfileutils \ + nautilus2 ltverhack pygtk2 gnomehier USE_GSTREAMER= core gconf hal good mpeg2dec soup ugly python gio INSTALLS_ICONS= yes USE_GMAKE= yes @@ -37,9 +37,10 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes INSTALLS_OMF= yes PKGMESSAGE= ${WRKDIR}/pkg-message -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lXrandr" \ - BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}" CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= LIBS="-lXrandr" \ + BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}" CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}" MAN1= totem.1 totem-video-thumbnailer.1 diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 1a7c31925e9e..e262da38c1c1 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: avahi -# Date created: 18 November 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/net/avahi/Makefile,v 1.30 2011/03/13 17:23:19 kwm Exp $ -# PORTNAME= avahi PORTVERSION= 0.6.29 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net dns MASTER_SITES= # empty DISTFILES= # empty @@ -20,46 +16,45 @@ COMMENT= The "meta-port" for the Avahi service discovery suite RUN_DEPENDS= avahi-resolve:${PORTSDIR}/net/avahi-app \ avahi-app>=0.6.20_2:${PORTSDIR}/net/avahi-app -OPTIONS= AUTOIPD "IPv4LL network address configuration daemon" off \ - GTK "Gtk+ tools and bindings" off \ - LIBDNS "Apple's mDNSResponder compatibility library" off \ - MONO "Mono bindings" off \ - QT3 "Qt 3 bindings" off \ - QT4 "Qt 4 bindings" off \ - PYTHON "Python bindings and tools" off +OPTIONS_DEFINE= AUTOIPD GTK LIBDNS MONO QT3 QT4 PYTHON +OPTIONS_DEFAULT=AUTOIPD GTK LIBDNS +AUTOIPD_DESC= IPv4LL network address configuration daemon +GTK_DESC= Gtk+ tools and bindings +LIBDNS_DESC= Apple's mDNSResponder compatibility library +QT3_DESC= Qt 3 toolkit NO_BUILD= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_AUTOIPD) +.if ${PORT_OPTIONS:MAUTOIPD} RUN_DEPENDS+= avahi-autoipd:${PORTSDIR}/net/avahi-autoipd .endif -.if defined(WITH_GTK) +.if ${PORT_OPTIONS:MGTK} RUN_DEPENDS+= avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk .endif -.if defined(WITH_LIBDNS) +.if ${PORT_OPTIONS:MLIBDNS} RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns .endif -.if defined(WITH_MONO) +.if ${PORT_OPTIONS:MMONO} RUN_DEPENDS+= ${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp .endif -.if defined(WITH_QT3) +.if ${PORT_OPTIONS:MQT3} RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3 .endif -.if defined(WITH_QT4) +.if ${PORT_OPTIONS:MQT4} RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4 .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} RUN_DEPENDS+= avahi-bookmarks:${PORTSDIR}/net/py-avahi .endif do-install: -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/opal3/Makefile b/net/opal3/Makefile index b42e2cd1eaf0..00953ebefd8c 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: opal3 -# Date created: Thu Feb 17 15:00:48 GMT 2000 -# Whom: Roger Hardiman <roger@freebsd.org> -# +# Created by: Roger Hardiman <roger@freebsd.org> # $FreeBSD$ -# PORTNAME= opal3 PORTVERSION= 3.6.6 @@ -27,6 +23,7 @@ WRKSRC= ${WRKDIR}/opal-${PORTVERSION} USE_GCC= any USE_BZIP2= yes USE_GMAKE= yes +USES= pathfix GNU_CONFIGURE= yes USE_SLD= yes USE_LDCONFIG= yes @@ -36,32 +33,36 @@ CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= ZRTP "Enable ZRTP protocol support" off \ - JAVA "Enable Java JNI support" off \ - CELT "Use celt codec from ports" on \ - ILBC "USE iLBC codec from ports" off \ - GSM "Use GSM codec from ports" on \ - SPEEX "Use SPEEX codec from ports" on \ - THEORA "Enable theora codec support" off \ - FFMPEG "Enable ffmpeg codec support" on \ - X264 "Enable x.264 codec support" on \ - SIP "Enable SIP protocol support" on \ - H323 "Enable H.323 protocol support" off \ - IAX "Enable IAX2 protocol support" off \ - H224 "Enable H.224 control protocol" on \ - H281 "Enable H.281 (Far End Camera Control)" on \ - FAX "Enable Fax T.38 support" on \ - MSRP "Enable MSRP protocol" on \ - SIPIM "Enable SIP-IM protocol" on \ - RTPTEXT "Enable RFC4103 Text RTP payload" on \ - H450 "Enable H.450 H.323 subset" off \ - H460 "Enable H.460 H.323 extension for NAT traversal" off \ - H501 "Enable H.501 H323 mobility extensions" off \ - LID "Enable LID (Light-Weight Identity) support" on \ - UVIDEO "Enable RFC4175 uncompressed video RTP payload" off \ - AEC "Enable accoustic echo cancellation" on - -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= ZRTP JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ + H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO AEC +OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ + RTPTEXT LID AEC +ZRTP_DESC= ZRTP protocol support +JAVA_DESC= Java JNI support +CELT_DESC= Celt codec from ports +ILBC_DESC= iLBC codec from ports +GSM_DESC= GSM codec from ports +SPEEX_DESC= SPEEX codec from ports +THEORA_DESC= Theora codec support +FFMPEG_DESC= Ffmpeg codec support +X264_DESC= x.264 codec support +SIP_DESC= SIP protocol support +H323_DESC= H.323 protocol support +IAX_DESC= IAX2 protocol support +H224_DESC= H.224 control protocol +H281_DESC= H.281 (Far End Camera Control) +FAX_DESC= Fax T.38 support +MSRP_DESC= MSRP protocol +SIPIM_DESC= SIP-IM protocol +RTPTEXT_DESC= RFC4103 Text RTP payload +H450_DESC= H.450 H.323 subset +H460_DESC= H.460 H.323 extension for NAT traversal +H501_DESC= H.501 H323 mobility extensions +LID_DESC= LID (Light-Weight Identity) support +UVIDEO_DESC= RFC4175 uncompressed video RTP payload +AEC_DESC= Accoustic echo cancellation + +.include <bsd.port.options.mk> .ifdef OPALDIR .error OPALDIR is defined as an environment variable, or in the arguments \ @@ -72,36 +73,36 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \ PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g} \ PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//} -.if defined(WITH_ZRTP) +.if ${PORT_OPTIONS:MZRTP} .if !defined(SAFE_ZRTP) IGNORE= please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set .endif -LIB_DEPENDS+= zrtpcpp.0:${PORTSDIR}/devel/libzrtpcpp +LIB_DEPENDS+= zrtpcpp:${PORTSDIR}/devel/libzrtpcpp CONFIGURE_ARGS+= --enable-zrtp .else CONFIGURE_ARGS+= --disable-zrtp .endif -.if defined(WITH_GSM) -LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm +.if ${PORT_OPTIONS:MGSM} +LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm .else CONFIGURE_ARGS+= --enable-localgsm .endif -.if defined(WITH_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +.if ${PORT_OPTIONS:MSPEEX} +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex .else CONFIGURE_ARGS+= --enable-localspeex .endif -.if defined(WITH_JAVA) +.if ${PORT_OPTIONS:MJAVA} CONFIGURE_ARGS+= --enable-java .else CONFIGURE_ARGS+= --disable-java .endif -.if defined(WITH_CELT) -LIB_DEPENDS+= celt0.2:${PORTSDIR}/audio/celt +.if ${PORT_OPTIONS:MCELT} +LIB_DEPENDS+= celt0:${PORTSDIR}/audio/celt CONFIGURE_ARGS+= --enable-celt PLIST_SUB+= CELT="" .else @@ -109,14 +110,14 @@ CONFIGURE_ARGS+= --disable-celt PLIST_SUB+= CELT="@comment " .endif -.if defined(WITH_ILBC) -LIB_DEPENDS+= ilbc.0:${PORTSDIR}/net/ilbc +.if ${PORT_OPTIONS:MILBC} +LIB_DEPENDS+= ilbc:${PORTSDIR}/net/ilbc .else CONFIGURE_ARGS+= --enable-localilbc .endif -.if defined(WITH_THEORA) -LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora \ +.if ${PORT_OPTIONS:MTHEORA} +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora \ ogg:${PORTSDIR}/audio/libogg CONFIGURE_ARGS+= --enable-theora PLIST_SUB+= THEORA="" @@ -126,8 +127,8 @@ CONFIGURE_ARGS+= --disable-theora PLIST_SUB+= THEORA="@comment " .endif -.if defined(WITH_X264) -LIB_DEPENDS+= x264.125:${PORTSDIR}/multimedia/x264 +.if ${PORT_OPTIONS:MX264} +LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 CONFIGURE_ARGS+= --enable-h264 PLIST_SUB+= X264="" WITH_VIDEO= yes @@ -136,8 +137,9 @@ CONFIGURE_ARGS+= --disable-h264 PLIST_SUB+= X264="@comment " .endif -.if defined(WITH_FFMPEG) -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +BROKEN=chekc ffmpeg +.if ${PORT_OPTIONS:MFFMPEG} +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg CONFIGURE_ARGS+= --enable-ffmpeg --enable-ffmpeg-h263 CONFIGURE_ENV+= ac_cv_lib_avcodec_h263p_encoder=yes \ ac_cv_lib_avcodec_h264_decoder=yes \ @@ -158,37 +160,38 @@ CONFIGURE_ARGS+= --disable-video PLIST_SUB+= VIDEO="@comment " .endif -.if defined(WITH_SIP) +.if ${PORT_OPTIONS:MSIP} CONFIGURE_ARGS+= --enable-sip .else CONFIGURE_ARGS+= --disable-sip .endif -.if defined(WITH_H323) +.if ${PORT_OPTIONS:MH323} CONFIGURE_ARGS+= --enable-h323 .else CONFIGURE_ARGS+= --disable-h323 .endif -.if defined(WITH_IAX) +.if ${PORT_OPTIONS:MIAX} CONFIGURE_ARGS+= --enable-iax .else CONFIGURE_ARGS+= --disable-iax .endif -.if defined(WITH_H224) +.if ${PORT_OPTIONS:MH224} CONFIGURE_ARGS+= --enable-h224 .else CONFIGURE_ARGS+= --disable-h224 .endif -.if defined(WITH_H281) +.if ${PORT_OPTIONS:MH281} CONFIGURE_ARGS+= --enable-h281 .else CONFIGURE_ARGS+= --disable-h281 .endif -.if defined(WITH_FAX) +# keep version in lib_depend, to see the difference between spandsp-devel and normal +.if ${PORT_OPTIONS:MFAX} LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel CONFIGURE_ARGS+= --enable-fax --enable-t38 PLIST_SUB+= FAX="" @@ -197,44 +200,44 @@ CONFIGURE_ARGS+= --disable-fax --disable-t38 --disable-spandsp PLIST_SUB+= FAX="@comment " .endif -.if defined(WITH_MSRP) +.if ${PORT_OPTIONS:MMSRP} CONFIGURE_ARGS+= --enable-msrp ##BROKEN= Does not compile .else CONFIGURE_ARGS+= --disable-msrp .endif -.if defined(WITH_SIPIM) +.if ${PORT_OPTIONS:MSIPIM} CONFIGURE_ARGS+= --enable-sipim .else CONFIGURE_ARGS+= --disable-sipim .endif -.if defined(WITH_RTPTEXT) +.if ${PORT_OPTIONS:MRTPTEXT} CONFIGURE_ARGS+= --enable-rfc4103 .else CONFIGURE_ARGS+= --disable-rfc4103 .endif -.if defined(WITH_H450) +.if ${PORT_OPTIONS:MH450} CONFIGURE_ARGS+= --enable-h450 .else CONFIGURE_ARGS+= --disable-h450 .endif -.if defined(WITH_H460) +.if ${PORT_OPTIONS:MH460} CONFIGURE_ARGS+= --enable-h460 .else CONFIGURE_ARGS+= --disable-h460 .endif -.if defined(WITH_H501) +.if ${PORT_OPTIONS:MH501} CONFIGURE_ARGS+= --enable-h501 .else CONFIGURE_ARGS+= --disable-h501 .endif -.if defined(WITH_LID) +.if ${PORT_OPTIONS:MLID} CONFIGURE_ARGS+= --enable-lid --enable-ixj --enable-vpb PLIST_SUB+= LID="" .else @@ -242,23 +245,19 @@ CONFIGURE_ARGS+= --disable-lid --disable-ixj --disable-vpb PLIST_SUB+= LID="@comment " .endif -.if defined(WITH_UVIDEO) +.if ${PORT_OPTIONS:MUVIDEO} CONFIGURE_ARGS+= --enable-rfc4175 .else CONFIGURE_ARGS+= --disable-rfc4175 .endif -.if defined(WITH_AEC) +.if ${PORT_OPTIONS:MAEC} CONFIGURE_ARGS+= --enable-aec .else CONFIGURE_ARGS+= --disable-aec .endif -.if defined(WITH_DEBUG) -BROKEN=DEBUG: Not implemented -.else CONFIGURE_ARGS+= --disable-debug -.endif post-patch: @${REINPLACE_CMD} -e 's?-lopal?-lopal-${PORTVERSION:C/.[0-9]+$//g}?' ${WRKSRC}/opal.pc.in @@ -268,14 +267,14 @@ post-patch: @${REINPLACE_CMD} -e 's?^EXTRALIBS = $(ILBC_LIBS)?EXTRALIBS = $(ILBC_LIBS) -L/usr/local/lib?' ${WRKSRC}/plugins/audio/iLBC/Makefile.in @${REINPLACE_CMD} -e 's?ILBC_CFLAGS=""?ILBC_CFLAGS="-L/usr/local/lib"?' ${WRKSRC}/plugins/configure @${REINPLACE_CMD} -e 's?^\(EXTRALIBS\)\(.*\)?\1\2 -L/usr/local/lib?' ${WRKSRC}/plugins/fax/fax_spandsp/Makefile.in - @${REINPLACE_CMD} -e 's?/pkgconfig?data/pkgconfig?g' ${WRKSRC}/Makefile.in +# @${REINPLACE_CMD} -e 's?/pkgconfig?data/pkgconfig?g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's?@@SO_VER@@?'${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}'?g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's?@@SO_MAJ@@?'${PORTVERSION:C/.[0-9]+$//g}'.so?g' ${WRKSRC}/Makefile.in -.if !defined(WITH_DEBUG) +.if ! ${PORT_OPTIONS:MDEBUG} @${REINPLACE_CMD} -e 's/^\(all:\).*/\1 optdepend opt/' ${WRKSRC}/Makefile.in .endif post-configure: @${REINPLACE_CMD} -e 's?\$$(LIB_FILENAME_SHARED_PAT)?libopal-${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}?' ${WRKSRC}/opal_defs.mak -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 73630f3f2018..e33d0548a1e0 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: vinagre -# Date created: 16 December 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net/vinagre/Makefile,v 1.42 2010/09/29 14:23:36 kwm Exp $ -# +# $MCom: ports/net/vinagre/Makefile,v 1.48 2012/09/01 23:02:11 mezz Exp $ PORTNAME= vinagre PORTVERSION= 2.30.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,16 +12,18 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop -LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ - avahi-core.7:${PORTSDIR}/net/avahi-app \ - avahi-ui.0:${PORTSDIR}/net/avahi-gtk \ - gdbm.4:${PORTSDIR}/databases/gdbm \ +LIB_DEPENDS= gtk-vnc-1.0:${PORTSDIR}/net/gtk-vnc \ + avahi-core:${PORTSDIR}/net/avahi-app \ + avahi-ui:${PORTSDIR}/net/avahi-gtk \ + gdbm:${PORTSDIR}/databases/gdbm \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring +CONFLICTS= vinagre-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack vte gconf2 gnomedocutils \ - gnomepanel +USES= pathfix +USE_GNOME= gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -38,13 +36,15 @@ GCONF_SCHEMAS= vinagre.schemas MAN1= vinagre.1 -OPTIONS= TELEPATHY "Enable telepathy integration" on +OPTIONS_DEFINE= TELEPATHY +OPTIONS_DEFAULT=TELEPATHY +TELEPATHY_DESC= Telepathy integration -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_TELEPATHY) +.if ${PORT_OPTIONS:MTELEPATHY} CONFIGURE_ARGS+=--enable-telepathy -LIB_DEPENDS+= telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib +LIB_DEPENDS+= telepathy-glib:${PORTSDIR}/net-im/telepathy-glib PLIST_SUB+= TELEPATHY="" .else CONFIGURE_ARGS+=--disable-telepathy @@ -54,11 +54,11 @@ PLIST_SUB+= TELEPATHY="@comment " post-install: @-update-desktop-database > /dev/null @-update-mime-database ${PREFIX}/share/mime > /dev/null -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index dd6c63d00bfe..643e93356a19 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: packagekit -# Date created: 15 Aug 2009 -# Whom: Anders F Bjorklund <afb@users.sourceforge.net> -# +# Created by: Anders F Bjorklund <afb@users.sourceforge.net> # $FreeBSD$ # $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.26 2010/10/10 15:49:51 marcus Exp $ @@ -12,22 +9,22 @@ CATEGORIES= ports-mgmt sysutils MASTER_SITES= http://www.packagekit.org/releases/ MAINTAINER= gnome@FreeBSD.org -COMMENT?= A DBUS packaging abstraction layer +COMMENT?= DBUS packaging abstraction layer BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 \ +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ - ck-connector.0:${PORTSDIR}/sysutils/consolekit -RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ - ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ - ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + ck-connector:${PORTSDIR}/sysutils/consolekit +#RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ +# ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ +# ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= glib20 intltool +USE_GNOME= glib20 intltool gnomehier +USE_SQLITE= 3 USE_ICONV= yes USE_LDCONFIG= yes USE_PYTHON_BUILD= 2.5+ @@ -48,53 +45,43 @@ MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" MAKE_JOBS_UNSAFE=yes .if !defined(SLAVEPORT) -OPTIONS=PORTS "Use portupgrade for management, dummy if disabled" on \ - PORTDOCS "Build documentation" on -# gtk module seems to be broken/disabled/gone? -# GTK20 "Enable GTK+ modules" off \ +OPTIONS_DEFINE= PORTS MANPAGES +OPTIONS_DEFAULT=PORTS +PORTS_DESC=Use portupgrade for management, dummy if disabled -.if defined(NO_INSTALL_MANPAGES) -CONFIGURE_ARGS+=--disable-man-pages -.else +.include <bsd.port.options.mk> + +. if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 -.endif -.endif - -.include <bsd.port.pre.mk> +. else +CONFIGURE_ARGS+=--disable-man-pages +. endif -.if defined(WITH_PORTS) +. if ${PORT_OPTIONS:MPORTS} RUN_DEPENDS+= ${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade USE_RUBY= yes CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports PLIST_SUB+= PORTS="" -.else +. else CONFIGURE_ARGS+=--disable-ports --with-default-backend=dummy PLIST_SUB+= PORTS="@comment " -.endif +. endif -#.if defined(WITH_GTK) -#USE_GNOME+= gtk20 -#CONFIGURE_ARGS+=--enable-gtk-module -#PLIST_SUB+= GTK="" -#.else CONFIGURE_ARGS+=--disable-gtk-module PLIST_SUB+= GTK="@comment " -#.endif -.if defined(SLAVEPORT) -LIB_DEPENDS+= packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit +CONFIGURE_ARGS+=--disable-qt + +.elif defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4" +LIB_DEPENDS+= packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit -.if ${SLAVEPORT}=="qt4" CONFIGURE_ARGS+=--enable-qt -LIB_DEPENDS+= cppunit-1.12.1:${PORTSDIR}/devel/cppunit +LIB_DEPENDS+= cppunit-1.12:${PORTSDIR}/devel/cppunit USE_QT4+= dbus gui xml sql moc_build -.include "${PORTSDIR}/Mk/bsd.qt.mk" -.endif -.else -CONFIGURE_ARGS+=--disable-qt +#.include "${PORTSDIR}/Mk/bsd.qt.mk" .endif post-patch: @@ -114,4 +101,4 @@ post-install: @-update-mime-database ${PREFIX}/share/mime > /dev/null .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ports-mgmt/packagekit/pkg-plist b/ports-mgmt/packagekit/pkg-plist index 912208dc1c07..10601f0ad7ea 100644 --- a/ports-mgmt/packagekit/pkg-plist +++ b/ports-mgmt/packagekit/pkg-plist @@ -432,7 +432,6 @@ share/polkit-1/actions/org.freedesktop.packagekit.policy %%PORTS%%@dirrm share/PackageKit @dirrm %%PYTHON_SITELIBDIR%%/packagekit @dirrm lib/packagekit-backend -@dirrmtry lib/girepositry-1.0 @dirrm include/PackageKit/packagekit-glib2 @dirrm include/PackageKit/backend @dirrm include/PackageKit diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 6f9539942905..02ba62a60ba2 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -18,8 +18,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + popt:${PORTSDIR}/devel/popt USES= bison pathfix USE_GMAKE= yes @@ -34,13 +34,14 @@ LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} \ LIBVERSION=2.2 -OPTIONS= CUPS "Enable CUPS support" on +OPTIONS_DEFINE= CUPS +OPTIONS_DEFAULT=CUPS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_CUPS) && !defined(WITHOUT_CUPS) +.if ${PORT_OPTIONS:MCUPS} CONFIGURE_ARGS+= --with-cups -LIB_DEPENDS+= gnomecups-1.0:${PORTSDIR}/print/libgnomecups +LIB_DEPENDS+= gnomecups-1:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" .else CONFIGURE_ARGS+= --without-cups @@ -57,6 +58,6 @@ post-install: @${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts @${TOUCH} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index fd7c9b7df078..bbfa3f5e99da 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: seahorse-plugins -# Date created: 06 August 2008 -# Whom: Dave McKay <dave@mu.org> -# +# Created by: Dave McKay <dave@mu.org> # $FreeBSD$ # $MCom: ports/security/seahorse-plugins/Makefile,v 1.28 2011/07/03 11:57:45 kwm Exp $ -# PORTNAME= seahorse-plugins PORTVERSION= 2.30.1 @@ -16,38 +12,31 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Plug-ins for the Seahorse key and password management application -LIB_DEPENDS= cryptui.0:${PORTSDIR}/security/seahorse \ - gcrypt.18:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS= cryptui:${PORTSDIR}/security/seahorse \ + gcrypt:${PORTSDIR}/security/libgcrypt USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -#USE_GECKO= libxul19 -USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils +USES= pathfix +USE_GNOME= intlhack gnomeprefix gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= NAUTILUS "Enable the Nautilus component" on \ - GEDIT "Enable GEdit plug-in support" on \ - APPLET "Enable clipboard encryption applet" on \ - NOTIFY "Enable libnotify support" on -#EPIPHANY "Enable Epiphany plug-in support" on +OPTIONS_DEFINE= NAUTILUS GEDIT APPLET NOTIFY +NAUTILUS_DESC= Nautilus component +GEDIT_DESC= GEdit plug-in support +APPLET_DESC= Clipboard encryption applet GCONF_SCHEMAS= seahorse-plugins.schemas MAN1= seahorse-agent.1 seahorse-tool.1 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -#.if ${GECKO}=="libxul" -#CONFIGURE_ARGS+=--with-gecko=libxul-unstable -#.else -#CONFIGURE_ARGS+=--with-gecko=${GECKO:S/19//} -#.endif - -.if !defined(WITHOUT_GEDIT) +.if ${PORT_OPTIONS:MGEDIT} BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit PLIST_SUB+= GEDIT="" @@ -57,7 +46,7 @@ PLIST_SUB+= GEDIT="@comment " CONFIGURE_ARGS+=--disable-gedit .endif -.if !defined(WITHOUT_NAUTILUS) +.if ${PORT_OPTIONS:MNAUTILUS} USE_GNOME+= nautilus2 PLIST_SUB+= NAUTILUS="" .else @@ -65,16 +54,10 @@ PLIST_SUB+= NAUTILUS="@comment " CONFIGURE_ARGS+=--disable-nautilus .endif -#.if !defined(WITHOUT_EPIPHANY) -#BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -#RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -#PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.26" -#.else CONFIGURE_ARGS+=--disable-epiphany PLIST_SUB+= EPHY="@comment " -#.endif -.if !defined(WITHOUT_APPLET) +.if ${PORT_OPTIONS:MAPPLET} USE_GNOME+= gnomepanel PLIST_SUB+= APPLET="" .else @@ -82,8 +65,8 @@ CONFIGURE_ARGS+=--disable-applet PLIST_SUB+= APPLET="@comment " .endif -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-libnotify .endif @@ -98,4 +81,4 @@ post-install: @-update-desktop-database @-update-mime-database ${PREFIX}/share/mime -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 631a0e0cbd45..2d08cce6acab 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: Seahorse -# Date created: 08 March 2000 -# Whom: Dave McKay <dave@mu.org> -# +# Created by: Dave McKay <dave@mu.org> # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.104 2011/07/03 11:57:45 kwm Exp $ -# +# $MCom: ports/security/seahorse/Makefile,v 1.109 2012/09/01 23:02:12 mezz Exp $ PORTNAME= seahorse PORTVERSION= 2.32.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,20 +14,21 @@ COMMENT= GNOME application for managing encryption keys (PGP, SSH) BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - gcr.0:${PORTSDIR}/security/gnome-keyring \ - gcrypt.18:${PORTSDIR}/security/libgcrypt \ - soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + gcr:${PORTSDIR}/security/gnome-keyring \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + soup-2.4:${PORTSDIR}/devel/libsoup -CONFLICTS= seahorse-3.[0-9]* +CONFLICTS= libcryptui-3.[0-9]* seahorse-3.[0-9]* USE_XORG= sm USE_LDCONFIG= yes USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils +USES= pathfix +USE_GNOME= intlhack gnomeprefix gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes @@ -42,25 +39,25 @@ CONFIGURE_ARGS= --enable-introspection=no GCONF_SCHEMAS= seahorse.schemas MAN1= seahorse.1 seahorse-daemon.1 -OPTIONS= LDAP "Enable LDAP support" on \ - NOTIFY "Enable libnotify support" on \ - MDNS "Enable mDNS key sharing" on +OPTIONS_DEFINE= LDAP NOTIFY MDNS +OPTIONS_DEFAULT=LDAP NOTIFY MDNS +MDNS_DESC= mDNS key sharing -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes .else CONFIGURE_ARGS+=--disable-ldap .endif -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-libnotify .endif -.if !defined(WITHOUT_MDNS) +.if ${PORT_OPTIONS:MMDNS} LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app .else CONFIGURE_ARGS+=--disable-sharing @@ -70,4 +67,4 @@ post-patch: @${REINPLACE_CMD} -e 's|" == "|" = "|g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index d99d89cdf31a..32816776a1da 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: bonfire -# Date created: 2006-05-12 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/sysutils/brasero/Makefile,v 1.83 2010/11/15 21:53:38 kwm Exp $ @@ -15,21 +12,23 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao \ yelp:${PORTSDIR}/x11/yelp +CONFLICTS= brasero-3.[0-9]* + USE_GETTEXT= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_XORG= sm -USE_GNOME= intlhack gnomeprefix gnomehack gnomedocutils -GNOME_DESKTOP_VERSION=2 +USES= pathfix +USE_GNOME= intlhack gnomeprefix gnomedocutils USE_LDCONFIG= yes USE_GSTREAMER= gconf core INSTALLS_OMF= yes @@ -42,14 +41,16 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= brasero.1 GLIB_SCHEMAS= org.gnome.brasero.gschema.xml -OPTIONS= NAUTILUS "Enable Nautilus extension" on \ - LIBBURNIA "Enable libburnia plug-ins" off +OPTIONS_DEFINE= NAUTILUS LIBBURNIA +OPTIONS_DEFAULT=NAUTILUS +NAUTILUS_DESC= Nautilus extension +LIBBURNIA_DESC= libburnia plug-ins PLIST_SUB= FULL_VERSION=${PORTVERSION} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_NAUTILUS) +.if ${PORT_OPTIONS:MNAUTILUS} USE_GNOME+= nautilus2 CONFIGURE_ARGS+=--enable-nautilus PLIST_SUB+= NAUTILUS="" @@ -58,9 +59,9 @@ PLIST_SUB+= NAUTILUS="@comment " CONFIGURE_ARGS+=--enable-nautilus=no .endif -.if defined(WITH_LIBBURNIA) -LIB_DEPENDS+= burn.4:${PORTSDIR}/devel/libburn \ - isofs.6:${PORTSDIR}/devel/libisofs +.if ${PORT_OPTIONS:MLIBBURNIA} +LIB_DEPENDS+= burn:${PORTSDIR}/devel/libburn \ + isofs:${PORTSDIR}/devel/libisofs CONFIGURE_ARGS+=--enable-libburnia PLIST_SUB+= LIBBURNIA="" .else @@ -74,4 +75,4 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/proc/self/fd/0|/dev/fd/0|g' ${WRKSRC}/po/*.po -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index d726ab4cbe3e..c715ca43c9b0 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-settings-daemon -# Date created: 14 Jan 2008 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.75 2011/04/25 19:56:57 mezz Exp $ -# PORTNAME= gnome-settings-daemon PORTVERSION= 2.32.1 @@ -16,10 +12,10 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon -LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - notify.4:${PORTSDIR}/devel/libnotify \ - gdbm.4:${PORTSDIR}/databases/gdbm \ - nss3.1:${PORTSDIR}/security/nss +LIB_DEPENDS= canberra-gtk:${PORTSDIR}/audio/libcanberra \ + notify:${PORTSDIR}/devel/libnotify \ + gdbm:${PORTSDIR}/databases/gdbm \ + nss3:${PORTSDIR}/security/nss RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb CONFLICTS= gnome-settings-daemon-3.[0-9]* @@ -27,7 +23,8 @@ CONFLICTS= gnome-settings-daemon-3.[0-9]* USE_XORG= xxf86misc USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomedesktop libgnomekbd USE_GETTEXT= yes USE_GSTREAMER= good USE_LDCONFIG= yes @@ -36,7 +33,8 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= PULSEAUDIO "Enable Pulseaudio support" On +OPTIONS_DEFINE= PULSEAUDIO +OPTIONS_DEFAULT=PULSEAUDIO GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \ apps_gnome_settings_daemon_keybindings.schemas \ @@ -47,15 +45,15 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \ desktop_gnome_peripherals_touchpad.schemas \ gnome-settings-daemon.schemas -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_PULSEAUDIO) -CONFIGURE_ARGS+=--disable-pulse -PLIST_SUB+= PULSEAUDIO="@comment " -.else -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+=--enable-pulse PLIST_SUB+= PULSEAUDIO="" +.else +CONFIGURE_ARGS+=--disable-pulse +PLIST_SUB+= PULSEAUDIO="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index bf6c84955b8c..fd9c6dc327ad 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: HAL -# Date Created: 02 May 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/sysutils/hal/Makefile,v 1.81 2010/04/13 02:49:07 mezz Exp $ -# PORTNAME= hal DISTVERSION= 0.5.14 @@ -16,14 +12,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Hardware Abstraction Layer for simplifying device access BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ - volume_id.0:${PORTSDIR}/devel/libvolume_id \ - ck-connector.0:${PORTSDIR}/sysutils/consolekit +LIB_DEPENDS= polkit:${PORTSDIR}/sysutils/policykit \ + volume_id:${PORTSDIR}/devel/libvolume_id \ + ck-connector:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack ltverhack +USES= pathfix +USE_GNOME= intlhack ltverhack USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_PYTHON= yes @@ -71,7 +68,14 @@ MAN1= hal-disable-polling.1 hal-find-by-capability.1 \ hal-lock.1 hal-set-property.1 lshal.1 MAN8= hald.8 -OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off +OPTIONS_DEFINE= FIXED_MOUNTPOINTS +FIXED_MOUNTPOINTS_DESC= use fixed mountpoints + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MFIXED_MOUNTPOINTS} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c +.endif .include <bsd.port.pre.mk> @@ -79,10 +83,6 @@ OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif -.if defined(WITH_FIXED_MOUNTPOINTS) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c -.endif - .if ${OSVERSION} >= 800063 PLIST_SUB+= USB2="" .else @@ -113,7 +113,7 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${DOCSDIR}/README.freebsd diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index b5301d92334e..b4f64ad79b05 100644 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -14,7 +14,8 @@ COMMENT= Dictionary/spellchecking framework USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack glib20 ltverhack +USES= pathfix +USE_GNOME= glib20 ltverhack USE_PKGCONFIG= build CONFIGURE_ARGS= --disable-uspell \ --disable-voikko @@ -25,16 +26,15 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= enchant.1 -OPTIONS= ASPELL "Enable Aspell backend" on \ - HSPELL "Enable Hspell backend" off \ - HUNSPELL "Enable Hunspell backend" off \ - ISPELL "Enable Ispell backend" off \ - ZEMBEREK "Enable zemberek backend (requires DBUS)" off +OPTIONS_DEFINE= ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK +HSPELL_DESC= Spell checking via Hspell +HUNSPELL_DESC= Spell checking via Hunspell +ZEMBEREK_DESC= Spell checking via Zemberek -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_ASPELL) -LIB_DEPENDS+= pspell.16:${PORTSDIR}/textproc/aspell +.if ${PORT_OPTIONS:MASPELL} +LIB_DEPENDS+= pspell:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+=--enable-aspell \ --with-aspell-prefix=${LOCALBASE} PLIST_SUB+= ASPELL="" @@ -43,7 +43,7 @@ CONFIGURE_ARGS+=--disable-aspell PLIST_SUB+= ASPELL="@comment " .endif -.if defined(WITH_HSPELL) +.if ${PORT_OPTIONS:MHSPELL} BUILD_DEPENDS+= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell CONFIGURE_ARGS+=--enable-hspell PLIST_SUB+= HSPELL="" @@ -52,8 +52,8 @@ CONFIGURE_ARGS+=--disable-hspell PLIST_SUB+= HSPELL="@comment " .endif -.if defined(WITH_HUNSPELL) -LIB_DEPENDS+= hunspell-1.3.0:${PORTSDIR}/textproc/hunspell +.if ${PORT_OPTIONS:MHUNSPELL} +LIB_DEPENDS+= hunspell-1.3:${PORTSDIR}/textproc/hunspell CONFIGURE_ARGS+=--enable-myspell PLIST_SUB+= HUNSPELL="" .else @@ -61,7 +61,7 @@ CONFIGURE_ARGS+=--disable-myspell PLIST_SUB+= HUNSPELL="@comment " .endif -.if defined(WITH_ISPELL) +.if ${PORT_OPTIONS:MISPELL} RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--enable-ispell PLIST_SUB+= ISPELL="" @@ -70,8 +70,8 @@ CONFIGURE_ARGS+=--disable-ispell PLIST_SUB+= ISPELL="@comment " .endif -.if defined(WITH_ZEMBEREK) && !defined(WITHOUT_DBUS) -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +.if ${PORT_OPTIONS:MZEMBEREK} +LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS+=--enable-zemberek PLIST_SUB+= ZEMBEREK="" .else @@ -82,11 +82,5 @@ CONFIGURE_ARGS+=--disable-zemberek post-patch: @${REINPLACE_CMD} -e 's|MKDIRPROG-mkdir|MKDIRPROG-mkdir -p|g' \ ${WRKSRC}/install-sh -.if ${OSVERSION} < 700042 - @${REINPLACE_CMD} -E -e "s|-Wunsafe-loop-optimizations ||g" \ - -e "s|-Wno-missing-field-initializers ||g" \ - -e "s|-Wno-attributes ||g" \ - ${WRKSRC}/configure -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 8821272fe9c3..1064f160ae2c 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,10 +1,6 @@ -# Ports collection Makefile for: epiphany -# Date created: 24 April 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/www/epiphany/Makefile,v 1.246 2011/04/30 20:43:27 mezz Exp $ -# PORTNAME= epiphany PORTVERSION= 2.30.6 @@ -14,15 +10,15 @@ MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT?= An extremely lightweight and simple web browser for GNOME 2 +COMMENT?= Extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ - notify.4:${PORTSDIR}/devel/libnotify \ - gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \ + soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \ + notify:${PORTSDIR}/devel/libnotify \ + gnome-keyring:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes @@ -34,12 +30,13 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes USE_PYTHON= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils -WANT_GNOME= yes +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomedesktop desktopfileutils GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes CONFIGURE_ARGS+=--enable-introspection \ + --enable-compile-warnings=no \ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -pthread ${EXTRA_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include ${EXTRA_CFLAGS} @@ -50,36 +47,27 @@ PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}" MAN1= epiphany.1 -OPTIONS= NSS "Import passwords from 2.26 and older on first run" on \ - SPELLCHECK "Enable spell checking by default" on \ - SEED "Enable seed (JavaScript) support" off \ +OPTIONS_DEFINE= NSS SPELLECHECK SEED +OPTIONS_DEFAULT=NSS SPELLCHECK +NSS_DESC= Import passwords from 2.26 and older on first run +SPELLCHECK_DESC=Enable spell checking by default +SEED_DESC= Seed (JavaScript) support -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif - -.include <bsd.port.pre.mk> - -NO_WERROR= yes -# allow build with more warnings enabled -.if defined(NO_WERROR) -CONFIGURE_ARGS+= --enable-compile-warnings=no -.endif +.include <bsd.port.options.mk> -.if defined(WITH_NSS) -LIB_DEPENDS+= nss3.1:${PORTSDIR}/security/nss +.if ${PORT_OPTIONS:MNSS} +LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss CONFIGURE_ARGS+=--enable-nss .else CONFIGURE_ARGS+=--disable-nss .endif -.if defined(WITH_SEED) -LIB_DEPENDS+= seed.0:${PORTSDIR}/devel/seed +.if ${PORT_OPTIONS:MSEED} +LIB_DEPENDS+= seed:${PORTSDIR}/devel/seed CONFIGURE_ARGS+=--enable-seed .endif -.if defined(WITH_SPELLCHECK) +.if ${PORT_OPTIONS:MSPELLCHECK} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c .endif @@ -92,4 +80,4 @@ post-patch: post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index a0fb35fe56b1..989e75710e40 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -30,17 +30,19 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= STARTUP "Enable startup notification support" on +OPTIONS_DEFINE= STARTUP +OPTIONS_DEFAULT=STARTUP +STARTUP_DESC= Startup notification support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_STARTUP) -LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +.if ${PORT_OPTIONS:MSTARTUP} +LIB_DEPENDS+= startup-notification-1:${PORTSDIR}/x11/startup-notification CONFIGURE_ARGS+=--enable-startup-notification .else CONFIGURE_ARGS+=--disable-startup-notification .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index e3c6a10d92cf..228c984d8b4f 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: py-gtk2 -# Date created: 08/13/2002 -# Whom: marc@informatik.uni-bremen.de -# +# Created by: marc@informatik.uni-bremen.de # $FreeBSD$ # $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.78 2011/04/01 12:35:27 kwm Exp $ -# PORTNAME= gtk PORTVERSION= 2.24.0 @@ -17,7 +13,7 @@ DISTNAME= pygtk-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A set of Python bindings for GTK+ +COMMENT= Set of Python bindings for GTK+ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo @@ -25,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cair LATEST_LINK= py-gtk2 USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack libglade2 pygobject +USES= pathfix +USE_GNOME= libglade2 pygobject USE_PYTHON= yes USE_GETTEXT= yes GNU_CONFIGURE= yes @@ -41,11 +38,12 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-gtk CONFLICTS= py*-gtk-0* -OPTIONS= NUMPY "Enable numpy support (pulls in gcc44)" off +OPTIONS_DEFINE= NUMPY +NUMPY_DESC= Numpy support (pulls in gcc44) -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_NUMPY) +.if ${PORT_OPTIONS:MNUMPY} BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} CONFIGURE_ARGS+=--enable-numpy @@ -66,17 +64,17 @@ CONFIGURE_ARGS+= --disable-thread .endif post-install: -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf - ${CHOWN} -R ${BINOWN}:${BINGRP} ${EXAMPLESDIR} ${FIND} ${EXAMPLESDIR} -type d -print | ${XARGS} ${CHMOD} 0555 ${FIND} ${EXAMPLESDIR} -type f -print | ${XARGS} ${CHMOD} 0444 .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/MAPPING ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/THREADS ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index e5a702086f78..06c3b8a7fe1b 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: gdm2 -# Date created: 20 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $ -# +# $MCom: ports/x11/gdm/Makefile,v 1.192 2012/09/03 16:28:28 mezz Exp $ PORTNAME= gdm -PORTVERSION= 2.30.5 -PORTREVISION= 6 +PORTVERSION= 2.30.7 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,21 +14,23 @@ COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ - polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ +LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \ + polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ - upower-glib.1:${PORTSDIR}/sysutils/upower \ - xklavier.12:${PORTSDIR}/x11/libxklavier \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra + upower-glib:${PORTSDIR}/sysutils/upower \ + xklavier:${PORTSDIR}/x11/libxklavier \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ gnome-session:${PORTSDIR}/x11/gnome-session \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +CONFLICTS= gdm-3.[0-9]* + USERS= gdm GROUPS= gdm -USE_BZIP2= yes +USE_XZ= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_XORG= dmx dmxproto @@ -40,7 +38,8 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ +USES= pathfix +USE_GNOME= intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes @@ -58,19 +57,20 @@ PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var -OPTIONS= IPV6 "Enable IPv6 support" off \ - KEYRING "Enable GnomeKeyring/PAM integration" on +OPTIONS_DEFINE= IPV6 KEYRING +OPTIONS_DEFAULt=KEYRING +KEYRING_DESC= GnomeKeyring/PAM integration -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_KEYRING) -SUB_LIST+= PAM_KEYRING=\# -.else -LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +.if ${PORT_OPTIONS:MKEYRING} +LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring SUB_LIST+= PAM_KEYRING= +.else +SUB_LIST+= PAM_KEYRING=\# .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -106,4 +106,4 @@ post-install: | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 11fd7392b7e4..1346e9a0ca65 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gdm-2.30.5.tar.bz2) = faa1cbaecf84a7015f8bfd242200deae9b7c18bf6f7ad38335fd1503e023f92d -SIZE (gnome2/gdm-2.30.5.tar.bz2) = 2406523 +SHA256 (gnome2/gdm-2.30.7.tar.xz) = e5a098ebf0fdb5aff669dfca6e696433c4c8962c005bd13f296b7e13a60bc03b +SIZE (gnome2/gdm-2.30.7.tar.xz) = 1715056 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index bdc726d08d88..9feb8801fe67 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,30 +1,26 @@ #!/bin/sh - # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $ -# +# $MCom: ports/x11/gdm/files/gdm.in,v 1.50 2012/01/15 18:18:36 kwm Exp $ + # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus # # Add the following to /etc/rc.conf to start GDM at boot time: # # gdm_enable="YES" +# . /etc/rc.subr . %%GNOME_SUBR%% -export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin - -name="gdm" -rcvar=gdm_enable - -load_rc_config ${name} - -gnome_enable=${gnome_enable:-NO} gdm_enable=${gdm_enable-${gnome_enable}} gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO} gdm_lang=${gdm_lang-${LANG}} +export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin + +name="gdm" +rcvar=gdm_enable command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" procname="%%PREFIX%%/sbin/gdm-binary" @@ -32,14 +28,15 @@ start_cmd="gdm_start" gdm_start() { - local iter - + if ! checkyesno gdm_enable ; then + return 0 + fi echo "Starting ${name}." # make sure there is no pam configuration for gdm service in base system if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled - unlink /etc/pam.d/gdm + rm -f /etc/pam.d/gdm fi ( iter=0 @@ -52,9 +49,6 @@ gdm_start() done iter=0 while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do - if [ ! -x %%LOCALBASE%%/bin/lshal ]; then - err 1 "%%LOCALBASE%%/bin/lshal is not installed" - fi if [ ${iter} -eq 60 ]; then break fi @@ -64,4 +58,5 @@ gdm_start() LANG=${gdm_lang} ${command} ${gdm_flags} ) & } +load_rc_config ${name} run_rc_command "$1" diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in index 52ad31672ad8..d6382bb34a69 100644 --- a/x11/gdm/files/gdm.pam.in +++ b/x11/gdm/files/gdm.pam.in @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/files/gdm.pam.in,v 1.3 2010/07/21 13:50:46 kwm Exp $ +# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.17 2011/06/02 11:58:24 kwm Exp $ # # PAM configuration for the "gdm" service # diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c index 31baf67050ed..a15c91658554 100644 --- a/x11/gdm/files/patch-daemon_gdm-session-worker.c +++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c @@ -1,5 +1,5 @@ ---- daemon/gdm-session-worker.c.orig 2010-08-11 13:40:07.000000000 -0400 -+++ daemon/gdm-session-worker.c 2011-08-13 23:37:04.000000000 -0400 +--- daemon/gdm-session-worker.c.orig 2011-06-02 09:50:17.000000000 -0500 ++++ daemon/gdm-session-worker.c 2011-06-24 17:59:50.000000000 -0500 @@ -31,6 +31,9 @@ #include <errno.h> #include <grp.h> @@ -10,7 +10,7 @@ #ifdef HAVE_LOGINDEVPERM #include <libdevinfo.h> -@@ -341,7 +344,7 @@ gdm_session_execute (const char *file, +@@ -341,7 +344,7 @@ * what to search if PATH is unset. POSIX may, dunno. */ @@ -19,50 +19,7 @@ } len = strlen (file) + 1; -@@ -1035,17 +1038,6 @@ gdm_cache_copy_file (GdmSessionWorker *w - error->message); - g_error_free (error); - } else { -- int res; -- -- res = chown (cachefilename, -- worker->priv->uid, -- worker->priv->gid); -- if (res == -1) { -- g_warning ("GdmSessionWorker: Error setting owner of cache file: %s", -- g_strerror (errno)); -- } -- -- g_chmod (cachefilename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - g_debug ("Copy successful"); - } - -@@ -1183,7 +1175,23 @@ gdm_session_worker_uninitialize_pam (Gdm - return; - - if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) { -- gdm_session_worker_cache_userfiles (worker); -+ pid_t pid; -+ -+ pid = fork (); -+ -+ if (pid == 0) { -+ if (setuid (worker->priv->uid) < 0) { -+ g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno)); -+ _exit (1); -+ } -+ -+ gdm_session_worker_cache_userfiles (worker); -+ _exit (0); -+ } -+ -+ if (pid > 0) { -+ gdm_wait_on_pid (pid); -+ } - pam_close_session (worker->priv->pam_handle, 0); - gdm_session_auditor_report_logout (worker->priv->auditor); - -@@ -2027,15 +2035,16 @@ gdm_session_worker_start_user_session (G +@@ -2032,15 +2035,16 @@ char *cachedirname; char *home_dir; int fd; @@ -83,7 +40,7 @@ if (setsid () < 0) { g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s", -@@ -2043,6 +2052,26 @@ gdm_session_worker_start_user_session (G +@@ -2048,6 +2052,25 @@ _exit (2); } @@ -93,7 +50,6 @@ + g_debug ("%s: setusercontext () failed for %s. " + "Aborting.", "gdm_session_worker_start_user_session", + login ? login : "(null)"); -+ _exit (1); + } + + /* Propagate PATH environment variable from user context to child processes */ diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index acabde1043d0..80a3d947dfa9 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -10,6 +10,8 @@ etc/gdm/Xsession etc/gdm/custom.conf.default @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf etc/gdm/gdm.schemas +etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop +etc/gdm/home/.local/share/applications/mimeapps.list etc/pam.d/gdm libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server libexec/gdm-crash-logger @@ -223,6 +225,9 @@ share/pixmaps/nohost.png @dirrm etc/gdm/PostSession @dirrm etc/gdm/PostLogin @dirrm etc/gdm/Init +@dirrmtry etc/gdm/home/.local/share/applications +@dirrmtry etc/gdm/home/.local/share +@dirrmtry etc/gdm/home/.local @unexec rm -rf %D/etc/gdm/home/.gconf* @dirrmtry etc/gdm/home @dirrmtry etc/gdm @@ -230,11 +235,6 @@ share/pixmaps/nohost.png @dirrmtry etc/dm @dirrmtry share/log/gdm @dirrmtry share/log -@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true -@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true -@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true -@unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true -@unexec rmdir /var/cache 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index ad16bdd1887a..534a88ddbd08 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeapplets2 -# Date created: 26th May 2000 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11/gnome-applets/Makefile,v 1.219 2011/04/10 19:41:38 mezz Exp $ -# PORTNAME= gnome-applets PORTVERSION= 2.32.1.1 @@ -18,11 +14,11 @@ COMMENT= Applets components for the GNOME 2 Desktop Environment BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - gweather.1:${PORTSDIR}/net/libgweather \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ - xklavier.12:${PORTSDIR}/x11/libxklavier \ - gucharmap.7:${PORTSDIR}/deskutils/gucharmap +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \ + gweather:${PORTSDIR}/net/libgweather \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + xklavier:${PORTSDIR}/x11/libxklavier \ + gucharmap:${PORTSDIR}/deskutils/gucharmap RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon @@ -32,9 +28,8 @@ USE_GMAKE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel gnomedocutils \ - libgnomekbd -WANT_GNOME= yes +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomepanel gnomedocutils libgnomekbd USE_GSTREAMER= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-mixer-applet \ @@ -46,36 +41,17 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \ mixer.schemas multiload.schemas stickynotes.schemas -OPTIONS= MINI_COMMANDER "Enable mini-commander applet" off +OPTIONS_DEFINE= MINI_COMMANDER +MINI_COMMANDER_DESC= Mini-commander applet -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif - -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \ - !defined(WITHOUT_LIBNOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify -.endif - -.if ${ARCH} != "i386" && ${ARCH} != "amd64" -CFLAGS+= -fPIC -PLIST_SUB= BATTERY="@comment " -.else -GCONF_SCHEMAS+= battstat.schemas -PLIST_SUB= BATTERY="" -.endif - -.if ${ARCH} != "i386" && ${ARCH} != "amd64" -PLIST_SUB+= CPUFREQ="@comment " -.else -PLIST_SUB+= CPUFREQ="" -GCONF_SCHEMAS+= cpufreq-applet.schemas + !${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .endif -.if defined(WITH_MINI_COMMANDER) +.if ${PORT_OPTIONS:MMINI_COMMANDER} CONFIGURE_ARGS+= --enable-mini-commander GCONF_SCHEMAS+= mini-commander-global.schemas mini-commander.schemas PLIST_SUB+= COMMANDER="" OLDCOMMANDER="@comment " @@ -93,6 +69,23 @@ PLIST_SUB+= PYTHON="" PLIST_SUB+= PYTHON="@comment " .endif +.include <bsd.port.pre.mk> + +.if ${ARCH} != "i386" && ${ARCH} != "amd64" +CFLAGS+= -fPIC +PLIST_SUB= BATTERY="@comment " +.else +GCONF_SCHEMAS+= battstat.schemas +PLIST_SUB= BATTERY="" +.endif + +.if ${ARCH} != "i386" && ${ARCH} != "amd64" +PLIST_SUB+= CPUFREQ="@comment " +.else +PLIST_SUB+= CPUFREQ="" +GCONF_SCHEMAS+= cpufreq-applet.schemas +.endif + post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|" == "|" = "|g' diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 96b627b3a43f..4ffd81761c35 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.230 2010/11/17 13:01:32 kwm Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.237 2012/10/25 09:21:00 kwm Exp $ # PORTNAME= gnome-panel PORTVERSION= 2.32.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,9 +20,11 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= gweather:${PORTSDIR}/net/libgweather \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + canberra-gtk:${PORTSDIR}/audio/libcanberra + +CONFLICTS= gnome-panel-3.[0-9]* mate-panel-* USE_GETTEXT= yes USE_XORG= ice sm x11 xau xrandr @@ -30,9 +32,9 @@ USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \ +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomedesktop libwnck gnomemenus \ gnomedocutils ltverhack referencehack librsvg2 -WANT_GNOME= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-network-manager @@ -46,24 +48,21 @@ GCONF_SCHEMAS= clock.schemas fish.schemas \ panel-toplevel.schemas window-list.schemas \ workspace-switcher.schemas -OPTIONS= EVOLUTION "use the Evolution calendar if installed" on \ - BONOBO "Support for bonobo applets aka Gnome 2 applets" on - -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif +OPTIONS_DEFINE= EVOLUTION BONOBO +OPTIONS_DEFAULT=EVOLUTION BONOBO +EVOLUTION_DESC= Use the Evolution calendar +BONOBO_DESC= Support for bonobo applets aka Gnome 2 applets -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!="" +.if ${PORT_OPTIONS:MEVOLUTION} USE_GNOME+= evolutiondataserver #CONFIGURE_ARGS+=--enable-eds .else CONFIGURE_ARGS+=--disable-eds .endif -.if defined(WITH_BONOBO) +.if ${PORT_OPTIONS:MBONOBO} USE_GNOME+= libbonoboui CONFIGURE_ARGS+=--enable-bonobo PLIST_SUB+= BONOBO="" @@ -86,6 +85,6 @@ post-install: @${MKDIR} ${PREFIX}/lib/gnome-panel/modules -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 65dd6f4ef497..d7d155cc4ce4 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-screensaver -# Date created: 09 June 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.124 2011/04/09 16:54:20 mezz Exp $ -# +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.125 2012/09/03 16:28:29 mezz Exp $ PORTNAME= gnome-screensaver PORTVERSION= 2.30.2 @@ -16,7 +12,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen saver and locker -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks CONFLICTS= gnome-screensaver-3.[0-9]* @@ -26,8 +22,8 @@ USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes USE_XORG= xtst xxf86vm -USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \ - gnomedesktop +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks @@ -46,12 +42,14 @@ SCREENSAVER_DIR= share/applications/screensavers XSCREENSAVER_EXCLUDE= "(popsquares.xml)" -OPTIONS= PAM "Pluggable Authentication Module support" on \ - KEYRING "Enable GnomeKeyring integration (needs PAM)" on +OPTIONS_DEFINE= PAM KEYRING +OPTIONS_DEFAULT=PAM KEYRING +PAM_DESC= Pluggable Authentication Module support +KEYRING_DESC= GnomeKeyring integration (needs PAM) -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} RUN_DEPENDS+= pam_helper:${PORTSDIR}/security/pam_helper CONFIGURE_ARGS+= --enable-authentication-scheme=helper \ --with-passwd-helper=${LOCALBASE}/bin/pam_helper @@ -61,7 +59,7 @@ CONFIGURE_ARGS+= --disable-pam PLIST_SUB+= PAM="@comment " .endif -.if defined(WITH_KEYRING) && defined(WITH_PAM) +.if ${PORT_OPTIONS:MKEYRING} && ${PORT_OPTIONS:MPAM} SUB_LIST+= PAM_KEYRING= RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring .else @@ -69,12 +67,12 @@ SUB_LIST+= PAM_KEYRING=\# .endif pre-everything:: -.if defined(WITHOUT_PAM) && defined(WITH_KEYRING) +.if !${PORT_OPTIONS:MPAM} && ${PORT_OPTIONS:MKEYRING} @${ECHO_MSG} "Keyring integration is disabled because it needs PAM." .endif post-patch: -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ ${WRKSRC}/src/gs-auth-pam.c .endif @@ -95,8 +93,8 @@ post-install: ${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \ ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \ ${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} ${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index b20b190355eb..00da270ff0ec 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome2 -# Date created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11/gnome2/Makefile,v 1.300 2010/11/18 01:37:46 kwm Exp $ -# PORTNAME= gnome2 PORTVERSION= 2.32.1 @@ -67,8 +63,9 @@ USE_PYTHON= yes .endif .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" -OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off \ - MAPI "Depend on evolution-mapi (pulls in samba4)" off +OPTIONS_DEFINE= XSCHEENSAVER +XSCREENSAVER_DESC= Use xscreensaver as screen saver app +# MAPI "Depend on evolution-mapi (pulls in samba4) .endif do-install: # empty @@ -101,14 +98,14 @@ RUN_DEPENDS+= cheese:${PORTSDIR}/multimedia/cheese .if ${ARCH} == "i386" #RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy .endif -.if defined(WITH_MAPI) +.if ${PORT_OPTIONS:MMAPI} RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi .endif .endif .endif .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" -.if defined(WITH_XSCREENSAVER) +.if ${PORT_OPTIONS:MXSCREENSAVER} RUN_DEPENDS+= ${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome .else RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile index 7f7afc08829e..03b0e19b3bf0 100644 --- a/x11/xscreensaver-gnome-hacks/Makefile +++ b/x11/xscreensaver-gnome-hacks/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xscreensaver-gnome-hacks -# Date created: 12 September 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xscreensaver-gnome-hacks PORTREVISION= 1 @@ -17,7 +13,8 @@ PLIST= ${.CURDIR}/pkg-plist CONFLICTS= xscreensaver-[0-9]* xscreensaver-gnome-[0-9]* -OPTIONS= ALL_FORTUNES "Enable support for all fortunes" off +OPTIONS_DEFINE= ALL_FORTUNES +ALL_FORTUNES_DESC= Enable support for all fortunes EXTRA_PATCHES= ${FILESDIR}/extra-patch-nodriver diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 955acf5c884a..5bfbd2bc19c8 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: zenity -# Date created: 01 Mar 2003 -# Whom: Franz Klammer <klammer@webonaut.com> -# +# Created by: Franz Klammer <klammer@webonaut.com> # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.111 2010/11/16 10:25:21 kwm Exp $ -# +# $MCom: ports/x11/zenity/Makefile,v 1.119 2013/01/09 18:51:14 kwm Exp $ PORTNAME= zenity PORTVERSION= 2.32.1 @@ -20,7 +16,8 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk20 gnomedocutils intlhack +USES= pathfix +USE_GNOME= gnomeprefix gtk20 gnomedocutils intlhack USE_BZIP2= yes USE_GETTEXT= yes GNU_CONFIGURE= yes @@ -28,20 +25,22 @@ INSTALLS_OMF= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -lintl +CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" MAN1= zenity.1 CONFLICTS= gtkada-1.2.* -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 +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-libnotify .else CONFIGURE_ARGS+= --disable-libnotify .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |