summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-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
7 files changed, 45 insertions, 57 deletions
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-18 14:41:27 +0800