From 4b656ad95db22726584def6d041943c5cfd6bf9c Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Fri, 24 May 2002 09:48:19 +0000
Subject: [PATCH] Update port to version 0.1.14 (gtk2 based).

---
 x11-fm/rox-session/Makefile       | 21 ++++++---------------
 x11-fm/rox-session/distinfo       |  2 +-
 x11-fm/rox-session/files/patch-aa | 10 ++++++++++
 x11-fm/rox-session/pkg-plist      |  1 +
 4 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 x11-fm/rox-session/files/patch-aa

diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 76807c24369f..a96361d4015c 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rox-session
-PORTVERSION=	0.1.13
+PORTVERSION=	0.1.14
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -14,30 +14,21 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	olgeni@FreeBSD.org
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/share/Choices:${PORTSDIR}/x11-fm/rox-base \
 		${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
 
-USE_GLIB=	yes
-USE_GTK=	yes
-
 WRKSRC=		${WRKDIR}/ROX-Session-${PORTVERSION}
 
-post-extract:
-	# Hopefully gtk-config and glib-config will become
-	# configurable, so don't bother to add patch-* files
-
-	@${PERL} -pi -e "s/gtk-config/gtk12-config/g" \
-		${WRKSRC}/src/Makefile.in
-	@${PERL} -pi -e "s/glib-config/glib12-config/g" \
-		${WRKSRC}/src/configure
-
 do-build:
 	# Run the custom build procedure
-	@cd ${WRKSRC} && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ./AppRun --compile
+	@cd ${WRKSRC}/ROX-Session && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ./AppRun --compile
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps/ROX-Session
-	@cd ${WRKSRC} && ${CP} -r AppIcon.xpm AppInfo.xml AppRun FreeBSD-ix86 Help Login MakeDefault.sh Setup Styles WindowMans ${PREFIX}/apps/ROX-Session
+	@cd ${WRKSRC}/ROX-Session && ${CP} -r AppIcon.xpm AppInfo.xml AppRun FreeBSD-ix86 Help Login MakeDefault.sh Options.xml Setup Styles WindowMans ${PREFIX}/apps/ROX-Session
 	@${CAT} ${FILESDIR}/rox-session | ${SED} -e "s|%%PREFIX%%|${PREFIX}|" > ${PREFIX}/bin/rox-session
 	@${CHMOD} 775 ${PREFIX}/bin/rox-session
 
diff --git a/x11-fm/rox-session/distinfo b/x11-fm/rox-session/distinfo
index 0a0b724e63af..cd09e31906b4 100644
--- a/x11-fm/rox-session/distinfo
+++ b/x11-fm/rox-session/distinfo
@@ -1 +1 @@
-MD5 (ROX-Session-0.1.13.tgz) = 27acbe2c0ffc0a8a86876516fc4364f4
+MD5 (ROX-Session-0.1.14.tgz) = a30e27cb25c41565b611a4295edfd402
diff --git a/x11-fm/rox-session/files/patch-aa b/x11-fm/rox-session/files/patch-aa
new file mode 100644
index 000000000000..847c1ecc4c66
--- /dev/null
+++ b/x11-fm/rox-session/files/patch-aa
@@ -0,0 +1,10 @@
+--- ROX-Session/src/session.c.orig	Thu May 23 23:36:57 2002
++++ ROX-Session/src/session.c	Thu May 23 23:37:05 2002
+@@ -25,6 +25,7 @@
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <ctype.h>
++#include <signal.h>
+ 
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist
index 21940e54e072..3b6a5678706c 100644
--- a/x11-fm/rox-session/pkg-plist
+++ b/x11-fm/rox-session/pkg-plist
@@ -7,6 +7,7 @@ apps/ROX-Session/Help/Changes
 apps/ROX-Session/Help/README
 apps/ROX-Session/Login
 apps/ROX-Session/MakeDefault.sh
+apps/ROX-Session/Options.xml
 apps/ROX-Session/Setup
 apps/ROX-Session/Styles
 apps/ROX-Session/WindowMans