Move gnome3 ports into the place of the gnome2 locations.

Update to new port rules, remove conflicts, latest_link, enable stage support.

gnome-games was skipped because I got a update for that.
gnome-keyring 2 vs 3, needs to be looked at.
zenity 2 vs 3, and libgnomekbd 2 vs 3

Use new lib_depend syntax in bsd.gnome.mk.

Possible lots of broken links.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 78 insertions, 44 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 495090c20..295c25407 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,53 +1,69 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gdm/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports/trunk/x11/gdm3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gdm
-PORTVERSION=	2.30.7
-PORTREVISION=	2
+PORTVERSION=	3.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 version of xdm display manager
+COMMENT=	GNOME 3 version of xdm display manager
 
-BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
+		itstool:${PORTSDIR}/textproc/itstool \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	ck-connector:${PORTSDIR}/sysutils/consolekit \
-		polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
-    		execinfo:${PORTSDIR}/devel/libexecinfo \
-		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 \
+LIB_DEPENDS=	libck-connector.so:${PORTSDIR}/sysutils/consolekit \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
+		libupower-glib.so:${PORTSDIR}/sysutils/upower \
+		libnss3.so:${PORTSDIR}/security/nss \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
+		libxklavier.so:${PORTSDIR}/x11/libxklavier \
+		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
+		gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
+		gnome-keyring-3:${PORTSDIR}/security/gnome-keyring3 \
+		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
+		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
+		${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-
-CONFLICTS=	gdm-3.[0-9]*
+# used in scripts
+RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
+		setxkbmap:${PORTSDIR}/x11/setxkbmap \
+		xmodmap:${PORTSDIR}/x11/xmodmap \
+		xterm:${PORTSDIR}/x11/xterm
 
 USERS=		gdm
 GROUPS=		gdm
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
+INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USES=		gettext gmake pathfix pkgconfig
-USE_GNOME=	intlhack gnomehier gconf2 librsvg2 \
-		gnomedocutils gnomeprefix gnomepanel
-GCONF_SCHEMAS=	gdm-simple-greeter.schemas
+USE_GNOME=	dconf gnomehier gnomeprefix intlhack librsvg2 gnomepanel3
 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
-CONFIGURE_ENV=	LIBS="-lm" \
-		GTKDOC="false"
+		--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
+		--enable-authentication-scheme=pam \
+		--with-console-kit \
+		--with-initial-vt=9 \
+		--with-systemd=no
+# this is a hack until we can get our own pam dir and dir in order.
+CONFIGURE_ARGS+=--with-default-pam-config=redhat
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAS_SA_LEN
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGLIBS=	-lm
+CONFIGURE_ENV=	LIBS="${CONFIGLIBS}" \
+		GTKDOC="false" \
+		ac_cv_header_execinfo_h=no
 
 SUB_FILES+=	gdm.pam
 
@@ -57,13 +73,17 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 GNOME_LOCALSTATEDIR=	/var
 
 OPTIONS_DEFINE=	IPV6 KEYRING
-OPTIONS_DEFAULt=KEYRING
-KEYRING_DESC=	GnomeKeyring/PAM integration
+OPTIONS_DEFAULT=KEYRING
+KEYRING_DESC=	Gnomekeyring/PAM integration
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 .if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 SUB_LIST+=	PAM_KEYRING=
 .else
 SUB_LIST+=	PAM_KEYRING=\#
@@ -78,31 +98,45 @@ CONFIGURE_ARGS+=	--disable-ipv6
 post-patch:
 	@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
 		${WRKSRC}/data/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lexecinfo||g' \
+		${WRKSRC}/common/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    	-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	    	${WRKSRC}/daemon/gdm-session-worker.c \
-		${WRKSRC}/data/gconf.path
-	@${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \
-	    	${WRKSRC}/data/session-setup.entries
+	    	${WRKSRC}/daemon/gdm-session-worker.c
+#		${WRKSRC}/gui/simple-greeter/extensions/password/gdm-password.pam
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
+		-e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
+		-e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
 		${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
-	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \
-		${WRKSRC}/data/greeter-autostart/*.desktop.in*
+	@${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
+		${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
+		${WRKSRC}/gui/simple-chooser/chooser-main.c
+	@${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
+		${WRKSRC}/data/Init.in \
+		${WRKSRC}/data/PostLogin \
+		${WRKSRC}/data/PostSession.in \
+		${WRKSRC}/data/PreSession.in \
+		${WRKSRC}/data/Xsession.in
+	@${RM}	${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
+		${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
+		${WRKSRC}/data/applications/gnome-mag.desktop \
+		${WRKSRC}/data/applications/gnome-shell.desktop \
+		${WRKSRC}/data/applications/gok.desktop
+#		${WRKSRC}/data/applications/orca-screen-reader.desktop
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
-	    	${PREFIX}/share/gdm/gconf.path
-	${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \
-	    	${PREFIX}/share/gdm/session-setup.entries
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
-		${PREFIX}/etc/gdm/custom.conf.default
-	${MKDIR} ${PREFIX}/share/xsessions
-	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
+		${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
+	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-welcome
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdm*.so.1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdm/simple-greeter/extensions/lib*.so
+
+# logwtmp lives here.
+.if ${OSVERSION} < 900000
+CONFIGLIBS+=	-lutil
+.endif
 
 .include <bsd.port.mk>