7 files changed, 83 insertions, 3 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 538a67216d36..2c2a53abfc86 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -5,12 +5,54 @@
 # $FreeBSD$
 #
 
+MAINDIR=	${.CURDIR}/../xscreensaver
+
+PORTNAME=	xscreensaver-gnome
+PORTVERSION!=	${MAKE} -V PORTVERSION -f ${MAINDIR}/${MAKEFILE}
+PORTREVISION!=	${MAKE} -V PORTREVISION -f ${MAINDIR}/${MAKEFILE}
+PORTEPOCH!=	${MAKE} -V PORTEPOCH -f ${MAINDIR}/${MAKEFILE}
 CATEGORIES=	x11 gnome
+DISTFILES=
 
 MAINTAINER=	gnome@FreeBSD.org
 
-MASTERDIR=	${.CURDIR}/../xscreensaver
+FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11/xscreensaver:patch
+BUILD_DEPENDS!=	${MAKE} -V BUILD_DEPENDS -f ${MAINDIR}/${MAKEFILE}
+LIB_DEPENDS!=	${MAKE} -V LIB_DEPENDS -f ${MAINDIR}/${MAKEFILE}
+RUN_DEPENDS!=	${MAKE} -V RUN_DEPENDS -f ${MAINDIR}/${MAKEFILE}
+
+RUN_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehier gnomelibs libcapplet gdkpixbuf
+GNU_CONFIGURE=	yes
+OLD_CONFIGURE_ARGS!=	${MAKE} -V CONFIGURE_ARGS -f ${MAINDIR}/${MAKEFILE}
+CONFIGURE_ARGS=	${OLD_CONFIGURE_ARGS:N--without-gnome} --with-gnome
+CONFIGURE_ENV!=	${MAKE} -V CONFIGURE_ENV -f ${MAINDIR}/${MAKEFILE}
+
+post-extract:
+	@${CP} -Rp ${WRKDIRPREFIX}${MAINDIR}/work/xscreensaver-${PORTVERSION} \
+		${WRKSRC}
+	@${RM} -f ${WRKSRC}/config.cache
+
+do-build:
+	@cd ${WRKSRC}/driver && ${GMAKE} clean xscreensaver-demo \
+		screensaver-properties.desktop
 
-WITH_GNOME=	yes
+do-install:
+	@${INSTALL_DATA} ${WRKSRC}/utils/images/screensaver-*.xpm \
+		${PREFIX}/share/gnome/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/utils/images/logo-50.xpm \
+		${PREFIX}/share/gnome/pixmaps/xscreensaver.xpm
+	@${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo \
+		${PREFIX}/bin/xscreensaver-gnome
+	@${INSTALL_SCRIPT} ${WRKSRC}/driver/screensaver-properties-capplet \
+		${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/driver/screensaver-properties.desktop \
+		${PREFIX}/share/gnome/apps/Settings/Desktop
+	@${INSTALL_DATA} ${WRKSRC}/driver/screensaver-properties.desktop \
+		${PREFIX}/share/gnome/control-center/Desktop
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/x11/xscreensaver-gnome/distinfo
diff --git a/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet b/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet
new file mode 100644
index 000000000000..eb0d2325229e
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- driver/screensaver-properties-capplet	2002/07/18 12:49:32	1.1
++++ driver/screensaver-properties-capplet	2002/07/18 12:49:41
+@@ -16,4 +16,4 @@
+ # xscreensaver-demo accepts the same arguments that Gnome's capplet does,
+ # except that "--capplet" must be the first argument.
+ 
+-exec xscreensaver-demo --crapplet "$@"
++exec xscreensaver-gnome --crapplet "$@"
diff --git a/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in b/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in
new file mode 100644
index 000000000000..fad757c8d1fc
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- driver/screensaver-properties.desktop.in	2002/07/18 12:49:32	1.1
++++ driver/screensaver-properties.desktop.in	2002/07/18 12:49:51
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+-Exec=xscreensaver-demo --crapplet
+-TryExec=xscreensaver-demo
++Exec=xscreensaver-gnome --crapplet
++TryExec=xscreensaver-gnome
+ Icon=xscreensaver.xpm
+ Terminal=0
+ _Name=Screensaver
diff --git a/x11/xscreensaver-gnome/pkg-comment b/x11/xscreensaver-gnome/pkg-comment
new file mode 100644
index 000000000000..742d4f7ebba5
--- /dev/null
+++ b/x11/xscreensaver-gnome/pkg-comment
@@ -0,0 +1 @@
+A component for integrating xscreensaver package into GNOME desktop
diff --git a/x11/xscreensaver-gnome/pkg-descr b/x11/xscreensaver-gnome/pkg-descr
new file mode 100644
index 000000000000..af5c95027833
--- /dev/null
+++ b/x11/xscreensaver-gnome/pkg-descr
@@ -0,0 +1 @@
+A component for integrating xscreensaver package into GNOME desktop.
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
new file mode 100644
index 000000000000..e610fd262303
--- /dev/null
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -0,0 +1,11 @@
+bin/screensaver-properties-capplet
+bin/xscreensaver-gnome
+share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
+share/gnome/control-center/Desktop/screensaver-properties.desktop
+share/gnome/pixmaps/screensaver-cmndln.xpm
+share/gnome/pixmaps/screensaver-colorselector.xpm
+share/gnome/pixmaps/screensaver-diagnostic.xpm
+share/gnome/pixmaps/screensaver-locking.xpm
+share/gnome/pixmaps/screensaver-power.xpm
+share/gnome/pixmaps/screensaver-snap.xpm
+share/gnome/pixmaps/xscreensaver.xpm