8 files changed, 92 insertions, 4 deletions
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 1ed7822d87f5..a1b99dfcc0ab 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -47,4 +47,16 @@ GNU_ARCH=	${MACHINE_ARCH}
 .endif
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION}
 
+ETCDIR=		${PREFIX}/../etc
+
+post-patch:
+.for f in bundle gswapp gswbundle woapp wobundle
+	${PERL} -pi -e 's/\$$\(TAR\) ch --exclude=CVS --to-stdout/\$$\(TAR\) -ch --exclude=CVS -f -/g' ${WRKSRC}/make/${f}.make
+.endfor
+
+post-install:
+	@${MKDIR} ${ETCDIR}
+	${INSTALL_SCRIPT} ${FILESDIR}/GNUstep.sh ${ETCDIR}/rc.d
+	${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
+
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/gnustep-gui/files/GNUstep.sh b/x11-toolkits/gnustep-gui/files/GNUstep.sh
new file mode 100644
index 000000000000..0c53c376a68e
--- /dev/null
+++ b/x11-toolkits/gnustep-gui/files/GNUstep.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+IFFILE=${PREFIX}/etc/gdomap_if
+PIDFILE=/var/run/gdomap.pid
+GNUSTEP_SYSTEM_ROOT=${PREFIX}/GNUstep/System
+
+case "$1" in
+start)
+	if [ -e ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh ]; then
+		. ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh
+		if [ -x ${GNUSTEP_SYSTEM_ROOT}/Tools/gdomap ]; then
+			rm -f ${PIDFILE}
+			${GNUSTEP_SYSTEM_ROOT}/Tools/gdomap -a ${IFFILE} -I ${PIDFILE}
+			echo -n ' GNUstep'
+		fi
+	fi
+	;;
+stop)
+	[ -r ${PIDFILE} ] && kill $(cat ${PIDFILE}) && echo -n ' GNUstep'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/x11-toolkits/gnustep-gui/files/gdomap_if b/x11-toolkits/gnustep-gui/files/gdomap_if
new file mode 100644
index 000000000000..dcb650b9b376
--- /dev/null
+++ b/x11-toolkits/gnustep-gui/files/gdomap_if
@@ -0,0 +1 @@
+127.0.0.1 255.255.255.0
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 111ddde99892..15383b1ed3bc 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -1268,6 +1268,8 @@ System/Tools/plser
 System/Tools/set_show_service
 System/Tools/sfparse
 System/share/config.site
+../etc/gdomap_if
+../etc/rc.d/GNUstep.sh
 @exec mkdir -p %D/Local
 @exec mkdir -p %D/Local/Users
 @exec mkdir -p %D/Local/Users/Administrator
@@ -1350,5 +1352,3 @@ System/share/config.site
 @dirrm Local/Users/Administrator
 @dirrm Local/Users
 @dirrm Local
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index 1ed7822d87f5..a1b99dfcc0ab 100644
--- a/x11-toolkits/gnustep-xgps/Makefile
+++ b/x11-toolkits/gnustep-xgps/Makefile
@@ -47,4 +47,16 @@ GNU_ARCH=	${MACHINE_ARCH}
 .endif
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION}
 
+ETCDIR=		${PREFIX}/../etc
+
+post-patch:
+.for f in bundle gswapp gswbundle woapp wobundle
+	${PERL} -pi -e 's/\$$\(TAR\) ch --exclude=CVS --to-stdout/\$$\(TAR\) -ch --exclude=CVS -f -/g' ${WRKSRC}/make/${f}.make
+.endfor
+
+post-install:
+	@${MKDIR} ${ETCDIR}
+	${INSTALL_SCRIPT} ${FILESDIR}/GNUstep.sh ${ETCDIR}/rc.d
+	${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
+
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/gnustep-xgps/files/GNUstep.sh b/x11-toolkits/gnustep-xgps/files/GNUstep.sh
new file mode 100644
index 000000000000..0c53c376a68e
--- /dev/null
+++ b/x11-toolkits/gnustep-xgps/files/GNUstep.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+IFFILE=${PREFIX}/etc/gdomap_if
+PIDFILE=/var/run/gdomap.pid
+GNUSTEP_SYSTEM_ROOT=${PREFIX}/GNUstep/System
+
+case "$1" in
+start)
+	if [ -e ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh ]; then
+		. ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh
+		if [ -x ${GNUSTEP_SYSTEM_ROOT}/Tools/gdomap ]; then
+			rm -f ${PIDFILE}
+			${GNUSTEP_SYSTEM_ROOT}/Tools/gdomap -a ${IFFILE} -I ${PIDFILE}
+			echo -n ' GNUstep'
+		fi
+	fi
+	;;
+stop)
+	[ -r ${PIDFILE} ] && kill $(cat ${PIDFILE}) && echo -n ' GNUstep'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/x11-toolkits/gnustep-xgps/files/gdomap_if b/x11-toolkits/gnustep-xgps/files/gdomap_if
new file mode 100644
index 000000000000..dcb650b9b376
--- /dev/null
+++ b/x11-toolkits/gnustep-xgps/files/gdomap_if
@@ -0,0 +1 @@
+127.0.0.1 255.255.255.0
diff --git a/x11-toolkits/gnustep-xgps/pkg-plist b/x11-toolkits/gnustep-xgps/pkg-plist
index 111ddde99892..15383b1ed3bc 100644
--- a/x11-toolkits/gnustep-xgps/pkg-plist
+++ b/x11-toolkits/gnustep-xgps/pkg-plist
@@ -1268,6 +1268,8 @@ System/Tools/plser
 System/Tools/set_show_service
 System/Tools/sfparse
 System/share/config.site
+../etc/gdomap_if
+../etc/rc.d/GNUstep.sh
 @exec mkdir -p %D/Local
 @exec mkdir -p %D/Local/Users
 @exec mkdir -p %D/Local/Users/Administrator
@@ -1350,5 +1352,3 @@ System/share/config.site
 @dirrm Local/Users/Administrator
 @dirrm Local/Users
 @dirrm Local
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R