Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

4 files changed, 8 insertions, 223 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 2d68d715bc3f..82369530afc7 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.58 2006/10/07 19:45:39 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.71 2007/03/12 21:25:30 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,7 +16,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 USE_BZIP2=	yes
@@ -24,7 +23,8 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
+		libgnomekbd
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
@@ -43,10 +43,6 @@ OPTIONS=	PAM "Pluggable Authentication Module support" off
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	Does not build on 4.X
-.endif
-
 .if !defined(WITH_PAM)
 CONFIGURE_ARGS+=	--disable-pam
 .endif
@@ -62,6 +58,7 @@ pre-install:
 post-install:
 	${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
 	${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
+	${MKDIR} ${PREFIX}/${SCREENSAVER_DIR}
 	cd ${PREFIX}/${SCREENSAVER_DIR} && \
 		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
 			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 12ac659ae359..ae7e9343ba0f 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.16.3.tar.bz2) = cbd3e3b96b24038c7838b89acae318dd
-SHA256 (gnome2/gnome-screensaver-2.16.3.tar.bz2) = c07bb2b7d9e32851fc119092ca604a7054ef88804f831daaf3122a02f38761c7
-SIZE (gnome2/gnome-screensaver-2.16.3.tar.bz2) = 2034974
+MD5 (gnome2/gnome-screensaver-2.18.0.tar.bz2) = c123d954b215d970dad117b15ca46cd7
+SHA256 (gnome2/gnome-screensaver-2.18.0.tar.bz2) = 7651a7c1205d2bc207ac6c317017b469efca9274b4ad4eb6ed739ea6293ce163
+SIZE (gnome2/gnome-screensaver-2.18.0.tar.bz2) = 2012668
diff --git a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
deleted file mode 100644
index 94d68b8f3a57..000000000000
--- a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gs-auth-pam.c.orig	Mon Aug 14 19:57:29 2006
-+++ src/gs-auth-pam.c	Mon Aug 14 20:07:43 2006
-@@ -204,7 +204,7 @@ pam_conversation (int                   
-                         if (res) {
-                                 reply [replies].resp_retcode = PAM_SUCCESS;
-                         } else {
--                                reply [replies].resp_retcode = PAM_INCOMPLETE;
-+                                reply [replies].resp_retcode = PAM_TRY_AGAIN;
-                         }
-                 }
-         }
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 350da74d6592..a60b97fdcef7 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -9,211 +9,10 @@ libexec/gnome-screensaver/floaters
 libexec/gnome-screensaver/popsquares
 libexec/gnome-screensaver/slideshow
 share/gnome/applications/gnome-screensaver-preferences.desktop
-share/gnome/applications/screensavers/anemone.desktop
-share/gnome/applications/screensavers/anemotaxis.desktop
-share/gnome/applications/screensavers/antinspect.desktop
-share/gnome/applications/screensavers/antmaze.desktop
-share/gnome/applications/screensavers/antspotlight.desktop
-share/gnome/applications/screensavers/apollonian.desktop
-share/gnome/applications/screensavers/apple2.desktop
-share/gnome/applications/screensavers/atlantis.desktop
-share/gnome/applications/screensavers/attraction.desktop
-share/gnome/applications/screensavers/atunnel.desktop
-share/gnome/applications/screensavers/barcode.desktop
-share/gnome/applications/screensavers/blaster.desktop
-share/gnome/applications/screensavers/blinkbox.desktop
-share/gnome/applications/screensavers/blitspin.desktop
-share/gnome/applications/screensavers/blocktube.desktop
-share/gnome/applications/screensavers/boing.desktop
-share/gnome/applications/screensavers/bouboule.desktop
-share/gnome/applications/screensavers/bouncingcow.desktop
-share/gnome/applications/screensavers/boxed.desktop
-share/gnome/applications/screensavers/boxfit.desktop
-share/gnome/applications/screensavers/braid.desktop
-share/gnome/applications/screensavers/bsod.desktop
-share/gnome/applications/screensavers/bubble3d.desktop
-share/gnome/applications/screensavers/bubbles.desktop
-share/gnome/applications/screensavers/bumps.desktop
-share/gnome/applications/screensavers/cage.desktop
-share/gnome/applications/screensavers/carousel.desktop
-share/gnome/applications/screensavers/ccurve.desktop
-share/gnome/applications/screensavers/celtic.desktop
-share/gnome/applications/screensavers/circuit.desktop
-share/gnome/applications/screensavers/cloudlife.desktop
-share/gnome/applications/screensavers/compass.desktop
-share/gnome/applications/screensavers/coral.desktop
 share/gnome/applications/screensavers/cosmos-slideshow.desktop
-share/gnome/applications/screensavers/crackberg.desktop
-share/gnome/applications/screensavers/critical.desktop
-share/gnome/applications/screensavers/crystal.desktop
-share/gnome/applications/screensavers/cube21.desktop
-share/gnome/applications/screensavers/cubenetic.desktop
-share/gnome/applications/screensavers/cubestorm.desktop
-share/gnome/applications/screensavers/cynosure.desktop
-share/gnome/applications/screensavers/dangerball.desktop
-share/gnome/applications/screensavers/decayscreen.desktop
-share/gnome/applications/screensavers/deco.desktop
-share/gnome/applications/screensavers/deluxe.desktop
-share/gnome/applications/screensavers/demon.desktop
-share/gnome/applications/screensavers/discrete.desktop
-share/gnome/applications/screensavers/distort.desktop
-share/gnome/applications/screensavers/drift.desktop
-share/gnome/applications/screensavers/endgame.desktop
-share/gnome/applications/screensavers/engine.desktop
-share/gnome/applications/screensavers/epicycle.desktop
-share/gnome/applications/screensavers/eruption.desktop
-share/gnome/applications/screensavers/euler2d.desktop
-share/gnome/applications/screensavers/extrusion.desktop
-share/gnome/applications/screensavers/fadeplot.desktop
-share/gnome/applications/screensavers/fiberlamp.desktop
-share/gnome/applications/screensavers/fireworkx.desktop
-share/gnome/applications/screensavers/flag.desktop
-share/gnome/applications/screensavers/flame.desktop
-share/gnome/applications/screensavers/flipflop.desktop
-share/gnome/applications/screensavers/flipscreen3d.desktop
-share/gnome/applications/screensavers/fliptext.desktop
-share/gnome/applications/screensavers/flow.desktop
-share/gnome/applications/screensavers/fluidballs.desktop
-share/gnome/applications/screensavers/flurry.desktop
-share/gnome/applications/screensavers/flyingtoasters.desktop
-share/gnome/applications/screensavers/fontglide.desktop
 share/gnome/applications/screensavers/footlogo-floaters.desktop
-share/gnome/applications/screensavers/forest.desktop
-share/gnome/applications/screensavers/fuzzyflakes.desktop
-share/gnome/applications/screensavers/galaxy.desktop
-share/gnome/applications/screensavers/gears.desktop
-share/gnome/applications/screensavers/gflux.desktop
-share/gnome/applications/screensavers/glblur.desktop
-share/gnome/applications/screensavers/gleidescope.desktop
-share/gnome/applications/screensavers/glforestfire.desktop
-share/gnome/applications/screensavers/glhanoi.desktop
-share/gnome/applications/screensavers/glknots.desktop
-share/gnome/applications/screensavers/glmatrix.desktop
-share/gnome/applications/screensavers/glplanet.desktop
-share/gnome/applications/screensavers/glslideshow.desktop
-share/gnome/applications/screensavers/glsnake.desktop
-share/gnome/applications/screensavers/gltext.desktop
-share/gnome/applications/screensavers/goop.desktop
-share/gnome/applications/screensavers/grav.desktop
-share/gnome/applications/screensavers/greynetic.desktop
-share/gnome/applications/screensavers/halftone.desktop
-share/gnome/applications/screensavers/halo.desktop
-share/gnome/applications/screensavers/helix.desktop
-share/gnome/applications/screensavers/hopalong.desktop
-share/gnome/applications/screensavers/hyperball.desktop
-share/gnome/applications/screensavers/hypercube.desktop
-share/gnome/applications/screensavers/hypertorus.desktop
-share/gnome/applications/screensavers/ifs.desktop
-share/gnome/applications/screensavers/imsmap.desktop
-share/gnome/applications/screensavers/interaggregate.desktop
-share/gnome/applications/screensavers/interference.desktop
-share/gnome/applications/screensavers/intermomentary.desktop
-share/gnome/applications/screensavers/jigglypuff.desktop
-share/gnome/applications/screensavers/jigsaw.desktop
-share/gnome/applications/screensavers/juggle.desktop
-share/gnome/applications/screensavers/juggler3d.desktop
-share/gnome/applications/screensavers/julia.desktop
-share/gnome/applications/screensavers/kaleidescope.desktop
-share/gnome/applications/screensavers/klein.desktop
-share/gnome/applications/screensavers/kumppa.desktop
-share/gnome/applications/screensavers/lament.desktop
-share/gnome/applications/screensavers/laser.desktop
-share/gnome/applications/screensavers/lavalite.desktop
-share/gnome/applications/screensavers/lightning.desktop
-share/gnome/applications/screensavers/lisa.desktop
-share/gnome/applications/screensavers/lissie.desktop
-share/gnome/applications/screensavers/lmorph.desktop
-share/gnome/applications/screensavers/loop.desktop
-share/gnome/applications/screensavers/maze.desktop
-share/gnome/applications/screensavers/memscroller.desktop
-share/gnome/applications/screensavers/menger.desktop
-share/gnome/applications/screensavers/metaballs.desktop
-share/gnome/applications/screensavers/mirrorblob.desktop
-share/gnome/applications/screensavers/mismunch.desktop
-share/gnome/applications/screensavers/moebius.desktop
-share/gnome/applications/screensavers/moire.desktop
-share/gnome/applications/screensavers/moire2.desktop
-share/gnome/applications/screensavers/molecule.desktop
-share/gnome/applications/screensavers/morph3d.desktop
-share/gnome/applications/screensavers/mountain.desktop
-share/gnome/applications/screensavers/munch.desktop
-share/gnome/applications/screensavers/nerverot.desktop
-share/gnome/applications/screensavers/noof.desktop
-share/gnome/applications/screensavers/noseguy.desktop
-share/gnome/applications/screensavers/pacman.desktop
-share/gnome/applications/screensavers/pedal.desktop
-share/gnome/applications/screensavers/penetrate.desktop
-share/gnome/applications/screensavers/penrose.desktop
 share/gnome/applications/screensavers/personal-slideshow.desktop
-share/gnome/applications/screensavers/petri.desktop
-share/gnome/applications/screensavers/phosphor.desktop
-share/gnome/applications/screensavers/piecewise.desktop
-share/gnome/applications/screensavers/pinion.desktop
-share/gnome/applications/screensavers/pipes.desktop
-share/gnome/applications/screensavers/polyhedra.desktop
-share/gnome/applications/screensavers/polyominoes.desktop
-share/gnome/applications/screensavers/polytopes.desktop
-share/gnome/applications/screensavers/pong.desktop
 share/gnome/applications/screensavers/popsquares.desktop
-share/gnome/applications/screensavers/providence.desktop
-share/gnome/applications/screensavers/pulsar.desktop
-share/gnome/applications/screensavers/pyro.desktop
-share/gnome/applications/screensavers/qix.desktop
-share/gnome/applications/screensavers/queens.desktop
-share/gnome/applications/screensavers/rd-bomb.desktop
-share/gnome/applications/screensavers/ripples.desktop
-share/gnome/applications/screensavers/rocks.desktop
-share/gnome/applications/screensavers/rorschach.desktop
-share/gnome/applications/screensavers/rotor.desktop
-share/gnome/applications/screensavers/rotzoomer.desktop
-share/gnome/applications/screensavers/rubik.desktop
-share/gnome/applications/screensavers/sballs.desktop
-share/gnome/applications/screensavers/shadebobs.desktop
-share/gnome/applications/screensavers/sierpinski.desktop
-share/gnome/applications/screensavers/sierpinski3d.desktop
-share/gnome/applications/screensavers/slidescreen.desktop
-share/gnome/applications/screensavers/slip.desktop
-share/gnome/applications/screensavers/sonar.desktop
-share/gnome/applications/screensavers/speedmine.desktop
-share/gnome/applications/screensavers/sphere.desktop
-share/gnome/applications/screensavers/spheremonics.desktop
-share/gnome/applications/screensavers/spiral.desktop
-share/gnome/applications/screensavers/spotlight.desktop
-share/gnome/applications/screensavers/sproingies.desktop
-share/gnome/applications/screensavers/squiral.desktop
-share/gnome/applications/screensavers/stairs.desktop
-share/gnome/applications/screensavers/starfish.desktop
-share/gnome/applications/screensavers/starwars.desktop
-share/gnome/applications/screensavers/stonerview.desktop
-share/gnome/applications/screensavers/strange.desktop
-share/gnome/applications/screensavers/substrate.desktop
-share/gnome/applications/screensavers/superquadrics.desktop
-share/gnome/applications/screensavers/swirl.desktop
-share/gnome/applications/screensavers/t3d.desktop
-share/gnome/applications/screensavers/tangram.desktop
-share/gnome/applications/screensavers/thornbird.desktop
-share/gnome/applications/screensavers/timetunnel.desktop
-share/gnome/applications/screensavers/triangle.desktop
-share/gnome/applications/screensavers/truchet.desktop
-share/gnome/applications/screensavers/twang.desktop
-share/gnome/applications/screensavers/vermiculate.desktop
-share/gnome/applications/screensavers/vidwhacker.desktop
-share/gnome/applications/screensavers/vines.desktop
-share/gnome/applications/screensavers/wander.desktop
-share/gnome/applications/screensavers/webcollage.desktop
-share/gnome/applications/screensavers/whirlwindwarp.desktop
-share/gnome/applications/screensavers/whirlygig.desktop
-share/gnome/applications/screensavers/worm.desktop
-share/gnome/applications/screensavers/wormhole.desktop
-share/gnome/applications/screensavers/xanalogtv.desktop
-share/gnome/applications/screensavers/xflame.desktop
-share/gnome/applications/screensavers/xjack.desktop
-share/gnome/applications/screensavers/xlyap.desktop
-share/gnome/applications/screensavers/xmatrix.desktop
-share/gnome/applications/screensavers/xrayswarm.desktop
-share/gnome/applications/screensavers/xspirograph.desktop
-share/gnome/applications/screensavers/xteevee.desktop
-share/gnome/applications/screensavers/zoom.desktop
 share/gnome/desktop-directories/gnome-screensaver.directory
 share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
 share/gnome/gnome-screensaver/lock-dialog-default.glade