summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/totem/Makefile22
-rw-r--r--multimedia/totem3/Makefile17
-rw-r--r--net-im/empathy/Makefile45
-rw-r--r--net/ekiga/Makefile30
-rw-r--r--security/seahorse/Makefile22
-rw-r--r--sysutils/brasero/Makefile13
-rw-r--r--sysutils/gnome-control-center3/Makefile21
-rw-r--r--sysutils/gnome-power-manager3/Makefile10
-rw-r--r--www/epiphany3/Makefile36
-rw-r--r--x11/gdm/Makefile15
-rw-r--r--x11/gdm/files/gdm.pam.in4
-rw-r--r--x11/gdm3/Makefile21
-rw-r--r--x11/gdm3/pkg-plist2
-rw-r--r--x11/gnome-panel/Makefile23
-rw-r--r--x11/gnome-panel/files/patch-configure11
-rw-r--r--x11/gnome-screensaver/Makefile26
16 files changed, 155 insertions, 163 deletions
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ef119da14..0f02063ed 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -43,10 +43,12 @@ MAN1= totem.1 totem-video-thumbnailer.1
GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \
totem.schemas
-OPTIONS= LIRC "Enable lirc support" off \
- GALAGO "Enable Galago support" off \
- BROWSER_PLUGINS "Enable install plugins for gecko browser" on \
-# TRACKER "Enable tracker local search plugin" off
+OPTIONS_DEFINE= LIRC GALAGO BROWSER_PLUGINS
+GALAGO_DESC= Galago support
+BROWSER_PLUGINS_DESC= Plugins for gecko browser
+#TRACKER_DESC= Tracker local search plugin
+
+OPTIONS_DEFAULT= BROWSER_PLUGINS
# check configure script for allowed_plugins="..." for new plugins
TOTEM_PLUGINS= thumbnail screensaver ontop gromit media-player-keys \
@@ -56,7 +58,7 @@ TOTEM_PLUGINS= thumbnail screensaver ontop gromit media-player-keys \
# Not using:
# TOTEM_PLUGINS= mythtv bemused jamendo
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
#.if defined(WITH_TRACKER)
#LIB_DEPENDS+= tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk
@@ -66,7 +68,7 @@ TOTEM_PLUGINS= thumbnail screensaver ontop gromit media-player-keys \
PLIST_SUB+= TRACKER="@comment "
#.endif
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc
PLIST_SUB+= LIRC=""
TOTEM_PLUGINS:= ${TOTEM_PLUGINS} lirc
@@ -74,7 +76,7 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} lirc
PLIST_SUB+= LIRC="@comment "
.endif
-.if defined(WITH_GALAGO)
+.if ${PORT_OPTIONS:MGALAGO}
LIB_DEPENDS+= galago.3:${PORTSDIR}/devel/libgalago
PLIST_SUB+= GALAGO=""
TOTEM_PLUGINS:= ${TOTEM_PLUGINS} galago
@@ -82,7 +84,7 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} galago
PLIST_SUB+= GALAGO="@comment "
.endif
-.if !defined(WITHOUT_BROWSER_PLUGINS)
+.if ${PORT_OPTIONS:MBROWSER_PLUGINS}
CONFIGURE_ARGS+=--enable-browser-plugins \
--enable-gmp-plugin \
--enable-narrowspace-plugin
@@ -104,7 +106,7 @@ PLIST_SUB+= BROWSER_PLUGINS="@comment "
.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
-DEFAULT_DVD_DEVICE=/dev/acd0
+DEFAULT_DVD_DEVICE=/dev/cd0
.endif
pre-everything::
@@ -123,4 +125,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile
index 6b861128c..6833e0f07 100644
--- a/multimedia/totem3/Makefile
+++ b/multimedia/totem3/Makefile
@@ -51,10 +51,13 @@ GLIB_SCHEMAS= org.gnome.totem.enums.xml \
org.gnome.totem.gschema.xml \
org.gnome.totem.plugins.opensubtitles.gschema.xml
-OPTIONS= LIRC "Enable lirc support" off \
- BROWSER_PLUGINS "Build plugins for a webkit-gtk3 browser" on \
- PUBLISH "Enable Publish (network playlist) plugin" off
-# TRACKER "Enable tracker local search plugin" off
+
+OPTIONS_DEFINE= LIRC BROWSER_PLUGINS PUBLISH
+BROWSER_PLUGINS_DESC= Plugins for gecko browser
+PUBLISH_DESC= Publish (network playlist) plugin
+TRACKER_DESC= Tracker local search plugin
+
+OPTIONS_DEFAULT=BROWSER_PLUGINS
# check configure script for allowed_plugins="..." for new plugins
TOTEM_PLUGINS= brasero-disc-recorder chapters dbusservice im-status gromit \
@@ -68,7 +71,7 @@ TOTEM_PLUGINS= brasero-disc-recorder chapters dbusservice im-status gromit \
.include <bsd.port.options.mk>
-.if defined(WITH_PUBLISH)
+.if ${PORT_OPTIONS:MPUBLISH}
LIB_DEPENDS+= epc-1.0:${PORTSDIR}/www/libepc
PLIST_SUB+= PUBLISH=""
TOTEM_PLUGINS:= ${TOTEM_PLUGINS} publish
@@ -88,7 +91,7 @@ PLIST_SUB+= PUBLISH="@comment "
PLIST_SUB+= TRACKER="@comment "
#.endif
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc
PLIST_SUB+= LIRC=""
TOTEM_PLUGINS:= ${TOTEM_PLUGINS} lirc
@@ -96,7 +99,7 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} lirc
PLIST_SUB+= LIRC="@comment "
.endif
-.if !defined(WITHOUT_BROWSER_PLUGINS)
+.if ${PORT_OPTIONS:MBROWSER_PLUGINS}
CONFIGURE_ARGS+=--enable-browser-plugins \
--enable-gmp-plugin \
--enable-narrowspace-plugin
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index f386deeaf..4dd3d6cb0 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -50,39 +50,40 @@ GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml
MAN1= empathy.1 empathy-accounts.1
-OPTIONS= JABBER "Enable jabber (XMPP) client support" on \
- MSN "Enable MSN client support" on \
- IRC "Enable IRC client support" on \
- SALUT "Enable link-local (serverless) XMPP support" off \
- HAZE "Enable libpurple protocol integration" off \
- WEBKIT "Enable Adium Message Style themes" on \
- NST "Enable Nautilus SendTo plugin" on \
- MAP "Enable graphical map support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_JABBER)
+OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE WEBKIT NST MAP
+OPTIONS_DEFAULT=JABBER MSN IRC WEBKIT NST MAP
+MSN_DESC= MSN client support
+IRC_DESC= IRC client support
+SALUT_DESC= Link-local (serverless) XMPP support
+HAZE_DESC= Libpurple protocol integration
+WEBKIT_DESC= Adium Message Style themes
+NST_DESC= Nautilus SendTo plugin
+MAP_DESC= Graphical map support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MJABBER}
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble
.endif
-.if defined(WITH_MSN)
+.if ${PORT_OPTIONS:MMSN}
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly
.endif
-.if defined(WITH_IRC)
+.if ${PORT_OPTIONS:MIRC}
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle
.endif
-.if !defined(WITHOUT_SALUT)
+.if ${PORT_OPTIONS:MSALUT
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut
.endif
-.if !defined(WITHOUT_HAZE)
+.if ${PORT_OPTIONS:MHAZE}
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
.endif
-.if defined(WITH_WEBKIT)
-LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+.if ${PORT_OPTIONS:MWEBKIT}
+LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
CONFIGURE_ARGS+=--enable-webkit
PLIST_SUB+= ADIUM=""
.else
@@ -90,7 +91,7 @@ CONFIGURE_ARGS+=--disable-webkit
PLIST_SUB+= ADIUM="@comment "
.endif
-.if defined(WITH_NST)
+.if ${PORT_OPTIONS:MNST}
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto
CONFIGURE_ARGS+=--enable-nautilus-sendto=yes
@@ -100,9 +101,9 @@ CONFIGURE_ARGS+=--enable-nautilus-sendto=no
PLIST_SUB+= NST="@comment "
.endif
-.if !defined(WITHOUT_MAP)
+.if ${PORT_OPTIONS:MMAP}
USE_GL= gl
-LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain08
+LIB_DEPENDS+= champlain-0.8:${PORTSDIR}/graphics/libchamplain08
CONFIGURE_ARGS+=--enable-map
PLIST_SUB+= MAP=""
.else
@@ -110,4 +111,4 @@ CONFIGURE_ARGS+=--disable-map
PLIST_SUB+= MAP="@comment "
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index e303412a7..dcbd2faed 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,6 +1,6 @@
# Created by: roger@FreeBSD.org
# $FreeBSD$
-# $MCom$
+# $MCom: ports/trunk/net/ekiga/Makefile 18393 2013-04-26 21:23:07Z kwm $
PORTNAME= ekiga
PORTVERSION= 2.0.11
@@ -13,9 +13,6 @@ COMMENT= VoIP phone for GNOME
LIB_DEPENDS= opal_r:${PORTSDIR}/net/opal
-OPTIONS= AVAHI "Support Avahi for service discovery on LAN" on \
- DBUS "Use D-BUS for interprocess communication" on
-
CONFLICTS= ekiga3-3.*
USE_BZIP2= yes
@@ -36,24 +33,19 @@ MAKE_JOBS_SAFE= yes
GCONF_SCHEMAS= ekiga.schemas
MAN1= ekiga.1
-pre-configure:
- ${REINPLACE_CMD} -e "s,PWLIB_REC_VERSION=.*,PWLIB_REC_VERSION=`ptlib-config \
- --version`," \
- -e "s,OPAL_REC_VERSION=.*,OPAL_REC_VERSION=`${AWK} \
- '/define OPAL_VERSION/ \
- {printf $$NF}' ${LOCALBASE}/include/opal/opal/buildopts.h`," \
- ${WRKSRC}/configure
+OPTIONS_DEFINE= AVAHI DBUS
+OPTIONS_DEFAULT=AVAHI DBUS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.ifndef (WITHOUT_AVAHI)
+.if ${PORT_OPTIONS:MAVAHI}
LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app
CONFIGURE_ARGS+=--enable-avahi
.else
CONFIGURE_ARGS+=--disable-avahi
.endif
-.ifndef (WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+=--enable-dbus
PLIST_SUB+= DBUS:=""
@@ -62,4 +54,12 @@ CONFIGURE_ARGS+=--disable-dbus
PLIST_SUB+= DBUS:="@comment "
.endif
-.include <bsd.port.post.mk>
+pre-configure:
+ ${REINPLACE_CMD} -e "s,PWLIB_REC_VERSION=.*,PWLIB_REC_VERSION=`ptlib-config \
+ --version`," \
+ -e "s,OPAL_REC_VERSION=.*,OPAL_REC_VERSION=`${AWK} \
+ '/define OPAL_VERSION/ \
+ {printf $$NF}' ${LOCALBASE}/include/opal/opal/buildopts.h`," \
+ ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 7ca3ac73d..6db7eaa05 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seahorse
PORTVERSION= 2.32.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,8 +25,8 @@ CONFLICTS= libcryptui-3.[0-9]* seahorse-3.[0-9]*
USE_XORG= sm
USE_LDCONFIG= yes
USE_BZIP2= yes
-USES= gettext pathfix pkgconfig
USE_GMAKE= yes
+USES= gettext pathfix pkgconfig
USE_GNOME= intlhack gnomeprefix gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
@@ -38,25 +38,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
@@ -66,4 +66,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 c563df531..2770c8234 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -22,11 +22,11 @@ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
CONFLICTS= brasero-3.[0-9]*
-USES= gettext pathfix pkgconfig shared-mime-info desktop-file-utils
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_XORG= sm
+USES= desktop-file-utils gettext pathfix pkgconfig shared-mime-info
USE_GNOME= intlhack gnomeprefix gnomedocutils
USE_LDCONFIG= yes
USE_GSTREAMER= gconf core
@@ -40,14 +40,17 @@ 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.options.mk>
-.if !defined(WITHOUT_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
USE_GNOME+= nautilus2
CONFIGURE_ARGS+=--enable-nautilus
PLIST_SUB+= NAUTILUS=""
@@ -56,7 +59,7 @@ PLIST_SUB+= NAUTILUS="@comment "
CONFIGURE_ARGS+=--enable-nautilus=no
.endif
-.if defined(WITH_LIBBURNIA)
+.if ${PORT_OPTIONS:MLIBBURNIA}
LIB_DEPENDS+= burn:${PORTSDIR}/devel/libburn \
isofs:${PORTSDIR}/devel/libisofs
CONFIGURE_ARGS+=--enable-libburnia
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index d42878b8d..9c47ecdfd 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -35,7 +35,7 @@ CONFLICTS= gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
LATEST_LINK= gnome-control-center3
USE_XZ= yes
-USES= gettext pathfix pkgconfig desktop-file-utils shared-mime-info
+USES= desktop-file-utils gettext pathfix pkgconfig shared-mime-info
USE_GMAKE= yes
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehier intlhack libxml2 gnomemenus3 \
@@ -53,20 +53,27 @@ LDFLAGS+= -L${LOCALBASE}/lib
WITH_GNOME= yes
.endif
-OPTIONS= CUPS "Enable cups (printing) support" On \
- CHEESE "Enable cheese webcam support" Off
+OPTIONS_DEFINE= CUPS
+OPTIONS_DEFAULT=CUPS
+CUPS_DESC= Cups (printing) support
+CHEESE_DESC= Cheese webcam support" Off
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE_i386= CHEESE
+OPTIONS_DEFAULT_i386= CHEESE
+OPTIONS_DEFINE_amd64= CHEESE
+OPTIONS_DEFAULT_amd64= CHEESE
-.if defined(WITH_CUPS)
-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client
PLIST_SUB+= CUPS=""
.else
PLIST_SUB+= CUPS="@comment "
CONFIGURE_ARGS+=--disable-cups
.endif
-.if ${OSVERSION}>=800000 && (defined(WITH_CHEESE) && (${ARCH}=="i386" || ${ARCH}=="amd64"))
+.if ${PORT_OPTIONS:MCHEESE}
CONFIGURE_ARGS+=--with-cheese
BUILD_DEPENDS+= cheese>=3.0.1:${PORTSDIR}/multimedia/cheese3
LIB_DEPENDS+= cheese.5:${PORTSDIR}/multimedia/cheese3
diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile
index 17d79a401..321ae019b 100644
--- a/sysutils/gnome-power-manager3/Makefile
+++ b/sysutils/gnome-power-manager3/Makefile
@@ -30,22 +30,18 @@ LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.power-manager.gschema.xml
-OPTIONS= MANPAGES "build man pages (pulls in docbook-utils)" off
+OPTIONS_DEFINE= MANPAGES
.include <bsd.port.options.mk>
-.if defined(PACKAGE_BUILDING)
-WITH_MANPAGES=yes
-.endif
-
-.if defined(WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING)
BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \
${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410
MAN1= gnome-power-statistics.1
.endif
post-patch:
-.if !defined(WITH_MANPAGES)
+.if ! ${PORT_OPTIONS:MMANPAGES}
@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
.endif
diff --git a/www/epiphany3/Makefile b/www/epiphany3/Makefile
index a9de90883..96a26977e 100644
--- a/www/epiphany3/Makefile
+++ b/www/epiphany3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT?= An extremely lightweight and simple web browser for GNOME 3
+COMMENT?= Extremely lightweight and simple web browser for GNOME 3
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
@@ -31,10 +31,10 @@ CONFLICTS= epiphany-2.[0-9]*
LATEST_LINK= epiphany3
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USES= gettext pathfix pkgconfig desktop-file-utils
USE_XZ= yes
USE_PYTHON= yes
-USE_SQLITE= yes
+USE_SQLITE= 3
+USES= desktop-file-utils gettext pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack gnomedocutils libxml2
USE_XORG= ice x11 sm
GNU_CONFIGURE= yes
@@ -54,43 +54,35 @@ 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" off \
- AVAHI "Enable zeroconf bookmark support" on \
- SPELLCHECK "Enable spell checking by default" on \
- SEED "Enable seed (JavaScript) support" on
+OPTIONS_DEFINE= AVAHI NSS SPELLCHECK SEED
+OPTIONS_DEFAULT=AVAHI NSS SPELLCHECK
+NSS_DESC= Import passwords from 2.26 and older
+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>
+.include <bsd.port.options.mk>
-NO_WERROR= yes
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
CONFIGURE_ARGS+= --enable-compile-warnings=no
-.endif
-.if defined(WITH_NSS)
+.if ${PORT_OPTIONS:MNSS}
LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
CONFIGURE_ARGS+=--enable-nss
.else
CONFIGURE_ARGS+=--disable-nss
.endif
-.if defined(WITH_AVAHI)
+.if ${PORT_OPTIONS:MAVAHI}
LIB_DEPENDS+= avahi-gobject:${PORTSDIR}/net/avahi-app
.else
CONFIGURE_ARGS+=--disable-zeroconf
.endif
-.if defined(WITH_SEED)
+.if ${PORT_OPTIONS:MSEED}
LIB_DEPENDS+= seed-gtk3:${PORTSDIR}/devel/seed3
CONFIGURE_ARGS+=--enable-seed
.endif
-.if defined(WITH_SPELLCHECK)
+.if ${PORT_OPTIONS:MSPELLCHECK}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c
.endif
@@ -101,4 +93,4 @@ post-patch:
s|-ldl"$$|"|g' \
${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 8da193150..283ab4bdc 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -31,13 +31,13 @@ USERS= gdm
GROUPS= gdm
USE_XZ= yes
-USES= gettext pathfix pkgconfig
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
USE_GMAKE= yes
+USES= gettext pathfix pkgconfig
USE_GNOME= intlhack gnomehier gconf2 librsvg2 \
gnomedocutils gnomeprefix gnomepanel
GCONF_SCHEMAS= gdm-simple-greeter.schemas
@@ -56,19 +56,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.options.mk>
-.if defined(WITHOUT_KEYRING)
-SUB_LIST+= PAM_KEYRING=\#
-.else
+.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
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 6d7b6436e..2274bb814 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
#
-# $FreeBSD: ports/x11/gdm/files/gdm.pam.in,v 1.7 2010/07/25 19:35:05 kwm Exp $
-# $MCom$
+# $FreeBSD$
+# $MCom: ports/trunk/x11/gdm/files/gdm.pam.in 17268 2013-04-01 05:13:11Z marcus $
#
# PAM configuration for the "gdm" service
#
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index c7aeb320a..67c9491be 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -39,7 +39,6 @@ GROUPS= gdm
LATEST_LINK= gdm3
USE_XZ= yes
-USES= gettext pathfix pkgconfig
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
INSTALLS_OMF= yes
@@ -47,9 +46,10 @@ INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
USE_GMAKE= yes
+USES= gettext pathfix pkgconfig
USE_GNOME= intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 dconf
-GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml
GNU_CONFIGURE= yes
+GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml
CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \
--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
--enable-authentication-scheme=pam \
@@ -68,23 +68,24 @@ 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.options.mk>
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-debug
.endif
-.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
diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist
index b049933e1..007f29246 100644
--- a/x11/gdm3/pkg-plist
+++ b/x11/gdm3/pkg-plist
@@ -342,3 +342,5 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/as
@dirrmtry share/locale/an/LC_MESSAGES
@dirrmtry share/locale/an
+@exec dconf update
+@unexec dconf update
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 7f0305479..c82eb778a 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -16,21 +16,20 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \
+LIB_DEPENDS= gweather:${PORTSDIR}/net/libgweather \
dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
canberra-gtk:${PORTSDIR}/audio/libcanberra
CONFLICTS= gnome-panel-3.[0-9]*
-USES= gettext pathfix
USE_XORG= ice sm x11 xau xrandr
USE_PYTHON= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
+USES= gettext 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
@@ -44,24 +43,22 @@ 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=""
@@ -84,6 +81,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-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
deleted file mode 100644
index 785c7f0f6..000000000
--- a/x11/gnome-panel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2010-01-07 14:47:10.000000000 +0100
-+++ configure 2010-01-07 14:47:58.000000000 +0100
-@@ -13318,7 +13318,7 @@
-
- # Find any Python interpreter.
- if test -z "$PYTHON"; then
-- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+ for ac_prog in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 73b8ac6e1..ab3c38dfb 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -19,9 +19,9 @@ CONFLICTS= gnome-screensaver-3.[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
-USES= gettext pathfix pkgconfig
GNU_CONFIGURE= yes
USE_XORG= xtst xxf86vm
+USES= gettext pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
@@ -41,12 +41,15 @@ SCREENSAVER_DIR= share/applications/screensavers
XSCREENSAVER_EXCLUDE= "(popsquares.xml)"
-OPTIONS= PAM "Pluggable Authentication Module support" on \
- KEYRING "Enable GnomeKeyring integration (needs PAM)" on
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= PAM KEYRING
+OPTIONS_DEFAULT=PAM KEYRING
+PAM_DESC= Pluggable Authentication Module support
+KEYRING_DESC= GnomeKeyring integration (needs PAM)
+
+.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
@@ -56,20 +59,15 @@ 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
SUB_LIST+= PAM_KEYRING=\#
.endif
-pre-everything::
-.if defined(WITHOUT_PAM) && defined(WITH_KEYRING)
- @${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
@@ -90,8 +88,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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-15 12:49:04 +0800