Misc. small fixes from the maintainer.

PR: 16935 Submitted by: maintainer
author: steve <steve@FreeBSD.org> 2000-02-27 23:01:17 +0800
committer: steve <steve@FreeBSD.org> 2000-02-27 23:01:17 +0800
commit: c0a3b21258f3dd556b9d62c0ce56170cdf44cb96 (patch)
tree: d94f2bf145e8cd1353acb4a122506e7a1a8377df
parent: f045505d3d9c7e295c7602b9677b961f06521f3a (diff)
download: freebsd-ports-gnome-c0a3b21258f3dd556b9d62c0ce56170cdf44cb96.tar.gz
freebsd-ports-gnome-c0a3b21258f3dd556b9d62c0ce56170cdf44cb96.tar.zst
freebsd-ports-gnome-c0a3b21258f3dd556b9d62c0ce56170cdf44cb96.zip
50 files changed, 100 insertions, 175 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-1.0/pkg-message b/editors/openoffice-1.0/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-1.0/pkg-message
+++ b/editors/openoffice-1.0/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-1.1-devel/pkg-message b/editors/openoffice-1.1-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-1.1-devel/pkg-message
+++ b/editors/openoffice-1.1-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-1.1/pkg-message b/editors/openoffice-1.1/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-1.1/pkg-message
+++ b/editors/openoffice-1.1/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-2.0-devel/pkg-message b/editors/openoffice-2.0-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-2.0-devel/pkg-message
+++ b/editors/openoffice-2.0-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-3-devel/pkg-message b/editors/openoffice-3-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-3-devel/pkg-message
+++ b/editors/openoffice-3-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-3/pkg-message b/editors/openoffice-3/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-3/pkg-message
+++ b/editors/openoffice-3/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice-devel/pkg-message b/editors/openoffice-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice-devel/pkg-message
+++ b/editors/openoffice-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-1.0/pkg-message b/editors/openoffice.org-1.0/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-1.0/pkg-message
+++ b/editors/openoffice.org-1.0/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-1.1-devel/pkg-message b/editors/openoffice.org-1.1-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-1.1-devel/pkg-message
+++ b/editors/openoffice.org-1.1-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-1.1/pkg-message b/editors/openoffice.org-1.1/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-1.1/pkg-message
+++ b/editors/openoffice.org-1.1/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-2-RC/pkg-message b/editors/openoffice.org-2-RC/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-2-RC/pkg-message
+++ b/editors/openoffice.org-2-RC/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-2-devel/pkg-message b/editors/openoffice.org-2-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-2-devel/pkg-message
+++ b/editors/openoffice.org-2-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-2.0-devel/pkg-message b/editors/openoffice.org-2.0-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-2.0-devel/pkg-message
+++ b/editors/openoffice.org-2.0-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-2.0/pkg-message b/editors/openoffice.org-2.0/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-2.0/pkg-message
+++ b/editors/openoffice.org-2.0/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-2/pkg-message b/editors/openoffice.org-2/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-2/pkg-message
+++ b/editors/openoffice.org-2/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-3-RC/pkg-message b/editors/openoffice.org-3-RC/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-3-RC/pkg-message
+++ b/editors/openoffice.org-3-RC/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-3-devel/pkg-message b/editors/openoffice.org-3-devel/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-3-devel/pkg-message
+++ b/editors/openoffice.org-3-devel/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-3/pkg-message b/editors/openoffice.org-3/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-3/pkg-message
+++ b/editors/openoffice.org-3/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice.org-vcltesttool/pkg-message b/editors/openoffice.org-vcltesttool/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice.org-vcltesttool/pkg-message
+++ b/editors/openoffice.org-vcltesttool/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/openoffice/pkg-message b/editors/openoffice/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/openoffice/pkg-message
+++ b/editors/openoffice/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/staroffice5/pkg-message b/editors/staroffice5/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/staroffice5/pkg-message
+++ b/editors/staroffice5/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/staroffice52/pkg-message b/editors/staroffice52/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/staroffice52/pkg-message
+++ b/editors/staroffice52/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/staroffice60/pkg-message b/editors/staroffice60/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/staroffice60/pkg-message
+++ b/editors/staroffice60/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/staroffice70/pkg-message b/editors/staroffice70/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/editors/staroffice70/pkg-message
+++ b/editors/staroffice70/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 4c82f6ae9197..a13eaf577b8a 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -9,14 +9,15 @@
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.hagenhomes.com/freebsd/files/  \
+MASTER_SITES=	http://afug.hypermart.net/files/ \
+		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
 EXTRACT_SUFX=	.tar
 DISTFILES=	applicat.rdb.gz libofa517li.so libsdb517li.so
 
-MAINTAINER=	dkwiebe@hagenhomes.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
@@ -62,15 +63,13 @@ post-configure:
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
 	@${ECHO} "${WRKDIR}/tmp" >> ${TMPDIR}/ld.so.conf.tmp
-	@${ECHO} "${TMPDIR}/sv001.tmp" >> ${TMPDIR}/ld.so.conf.tmp
+	@${ECHO} "/usr/X11R6/lib" >> ${TMPDIR}/ld.so.conf.tmp
 	@PATH=${PATH}:${TMPDIR}/sv001.tmp:/usr/compat/linux/tmp/sv001.tmp:/usr/compat/linux/tmp:/tmp
 	@LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/usr/compat/linux/lib
 	@/usr/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp
 	@${CAT} ${PKGDIR}/MESSAGE
 	@-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net
 
-# A seperate target as we need to be able to run this stuff independantly.
-post-install:
 	@${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin
 	@${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib
 	@${INSTALL_DATA} ${_DISTDIR}/libsdb517li.so ${PREFIX}/Office51/lib
@@ -79,7 +78,6 @@ post-install:
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
 	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
-	@${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/german/staroffice70/pkg-message b/german/staroffice70/pkg-message
index 1a14bfee9dde..dc497fd93b79 100644
--- a/german/staroffice70/pkg-message
+++ b/german/staroffice70/pkg-message
@@ -5,7 +5,6 @@ Darren Wiebe
 dkwiebe@hagenhomes.com
 
 You will very shortly be done a network install of StarOffice 5.1a.
-Once that is done run "make post-install".
 Once that is done exit X11 and run it again as the user that you usually use.
 Then run "make install-user" and do a standard workstation install.
 It will now be ready to use.
author	steve <steve@FreeBSD.org>	2000-02-27 23:01:17 +0800
committer	steve <steve@FreeBSD.org>	2000-02-27 23:01:17 +0800
commit	c0a3b21258f3dd556b9d62c0ce56170cdf44cb96 (patch)
tree	d94f2bf145e8cd1353acb4a122506e7a1a8377df
parent	f045505d3d9c7e295c7602b9677b961f06521f3a (diff)
download	freebsd-ports-gnome-c0a3b21258f3dd556b9d62c0ce56170cdf44cb96.tar.gz freebsd-ports-gnome-c0a3b21258f3dd556b9d62c0ce56170cdf44cb96.tar.zst freebsd-ports-gnome-c0a3b21258f3dd556b9d62c0ce56170cdf44cb96.zip