Upgrade to version 4.1.9

Submitted by:	Christian Weisgerber <naddy@mips.inka.de>

7 files changed, 139 insertions, 17 deletions

diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 6f79966fd043..0ddba37512c9 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -6,8 +6,8 @@
 #
 
 VERSION=	4.1
-REVISION=	6
-PORTREVISION=	1
+REVISION=	9
+PORTREVISION=	0
 
 PORTNAME=	xloadimage
 PORTVERSION=	${VERSION}.${REVISION}
@@ -36,6 +36,10 @@ MLINKS=		xloadimage.1 xsetbg.1 \
 
 post-patch:
 	@chmod a+rx ${WRKSRC}/configure
+	@cd ${WRKSRC}; ${MV} xloadimage.man xloadimage.man.old; \
+		${SED} -e s:/etc/X11/Xloadimage:${PREFIX}/etc/xloadimagerc: \
+		       -e s:/usr/lib/xloadimagerc:${PREFIX}/etc/xloadimagerc: \
+		< xloadimage.man.old > xloadimage.man
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xloadimage ${PREFIX}/bin
@@ -49,4 +53,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xloadimagerc \
 		${PREFIX}/share/examples/xloadimage/xloadimagerc
 
+post-install:
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.mk>
diff --git a/x11/xloadimage/distinfo b/x11/xloadimage/distinfo
index d4ea53eb3cf3..925e9b76cb0c 100644
--- a/x11/xloadimage/distinfo
+++ b/x11/xloadimage/distinfo
@@ -1,2 +1,2 @@
 MD5 (xloadimage.4.1.tar.gz) = 7331850fc04056ab8ae6b5725d1fb3d2
-MD5 (xloadimage_4.1-6.diff.gz) = 37d6d6d7108ed53e83b160111b883b54
+MD5 (xloadimage_4.1-9.diff.gz) = 4d4f2106e90373a894967ebb22b7bdd4
diff --git a/x11/xloadimage/files/patch-Makefile.in b/x11/xloadimage/files/patch-Makefile.in
index 3370c79f5072..779a016887ee 100644
--- a/x11/xloadimage/files/patch-Makefile.in
+++ b/x11/xloadimage/files/patch-Makefile.in
@@ -1,10 +1,14 @@
---- Makefile.in.orig	Wed Jun  6 23:49:17 2001
-+++ Makefile.in	Wed Jun  6 23:49:29 2001
-@@ -4,7 +4,7 @@
+--- Makefile.in.orig	Tue Jul 10 23:53:36 2001
++++ Makefile.in	Wed Jul 11 12:28:36 2001
+@@ -2,9 +2,10 @@
+ # Makefile for autoconf tutorial
+ #
  
++prefix = @prefix@
  CC = @CC@
- DEFS = @DEFS@
+-DEFS = @DEFS@ -DSYSPATHFILE=\"/etc/X11/Xloadimage\"
 -CFLAGS = @CFLAGS@
++DEFS = @DEFS@ -DSYSPATHFILE=\"@sysconfdir@/xloadimagerc\"
 +CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
  XLIB = @X_LIBS@ -lX11 @X_EXTRA_LIBS@
  LDFLAGS = @LDFLAGS@
diff --git a/x11/xloadimage/files/patch-xloadimage.man b/x11/xloadimage/files/patch-xloadimage.man
deleted file mode 100644
index f0e4cd6fe6dc..000000000000
--- a/x11/xloadimage/files/patch-xloadimage.man
+++ /dev/null
@@ -1,10 +0,0 @@
---- xloadimage.man.orig	Thu Jun  7 00:15:57 2001
-+++ xloadimage.man	Thu Jun  7 00:20:11 2001
-@@ -633,7 +633,6 @@
- xloadimage              - the image loader and viewer
- xsetbg                  - pseudonym which quietly sets the background
- xview                   - pseudonym which views in a window
--/etc/X11/Xloadimage     - default system-wide configuration file
- ~/.xloadimagerc         - user's personal configuration file
- .in -5
- .fi
diff --git a/x11/xloadimage/pkg-deinstall b/x11/xloadimage/pkg-deinstall
new file mode 100644
index 000000000000..021c1b864dd0
--- /dev/null
+++ b/x11/xloadimage/pkg-deinstall
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# De-installation setup of xloadimage
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${PREFIX}/etc/xloadimagerc
+
+# Function: tell the user what they need to do to delete the port completely
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| these steps as root:"
+    echo "|"
+    echo "|       rm -f ${CONFIG_FILE}"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    DEINSTALL)
+	if [ -f ${CONFIG_FILE} ]; then
+	    do_notice "$1"
+	fi
+	;;
+    POST-DEINSTALL)
+: nothing to post-deinstall for this port
+        ;;
+    *)
+	echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/x11/xloadimage/pkg-install b/x11/xloadimage/pkg-install
new file mode 100644
index 000000000000..f6ed2ea2a7e4
--- /dev/null
+++ b/x11/xloadimage/pkg-install
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Pre/post-installation setup of xloadimage
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${PREFIX}/etc/xloadimagerc
+SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/xloadimage
+
+# Function: tell the user what they need to do to use the port just installed
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| The existing $1 configuration file, ${CONFIG_FILE},"
+    echo "| has NOT been changed.  You may want to compare it to the"
+    echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+# Function: install configuration files
+#
+do_install()
+{
+    install -c -o root -g wheel ${SAMPLE_CONFIG_DIR}/xloadimagerc ${CONFIG_FILE}
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, ${CONFIG_FILE},"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs"
+    echo "+---------------"
+    echo
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ -f ${CONFIG_FILE} ]; then
+	    do_notice "$1"
+	else
+	    do_install "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/x11/xloadimage/pkg-plist b/x11/xloadimage/pkg-plist
index c826167d818c..866ff2aeee2a 100644
--- a/x11/xloadimage/pkg-plist
+++ b/x11/xloadimage/pkg-plist
@@ -3,5 +3,6 @@ bin/uufilter
 bin/xloadimage
 bin/xsetbg
 bin/xview
+etc/xloadimagerc
 share/examples/xloadimage/xloadimagerc
 @dirrm share/examples/xloadimage