3 files changed, 12 insertions, 36 deletions

diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 39f36d8bda02..8fb4b9c39013 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	1.1RC4
-SNAPDATE=	20030815
+PORTVERSION=	1.1rc5
 CATEGORIES+=	editors
-MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
-		http://people.freebsd.org/~maho/files/ \
-		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
+MASTER_SITES+=	ftp://openofficeorg.secsup.org/pub/software/openoffice/stable/%SUBDIR%/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/stable/%SUBDIR%/ \
+		http://www.binarycode.org/openoffice/stable/%SUBDIR%/ \
+		http://ftp.gwdg.de/pub/misc/openoffice/stable/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
-MASTER_SITE_SUBDIR=	${BUILD_NR}
-DISTFILES+=	oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \
-		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \
-		mozilla-vendor-1.0.2a.tgz:moz
+MASTER_SITE_SUBDIR=	${PORTVERSION}
+DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
+		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
 .if defined(L10NHELP)
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
@@ -96,7 +93,7 @@ CC=  gcc33
 CXX= g++33
 .endif
 
-EXTRACT_ONLY=	oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2
+EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
@@ -141,7 +138,7 @@ GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/oo_${BUILD_NR}_src/config_office
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
 LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
@@ -541,7 +538,7 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/freebsd-local.sh
+		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index ee4e7edbb925..9b421203c95c 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
+MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-3-devel/files/patch-scp+source+crashrep+crashrep_dynamic.scp b/editors/openoffice.org-3-devel/files/patch-scp+source+crashrep+crashrep_dynamic.scp
deleted file mode 100644
index a5aaf4f3c61a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-scp+source+crashrep+crashrep_dynamic.scp
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../scp/source/crashrep/crashrep_dynamic.scp.orig	Thu Aug 14 20:29:59 2003
-+++ ../scp/source/crashrep/crashrep_dynamic.scp	Thu Aug 14 20:30:12 2003
-@@ -19,12 +19,12 @@
- 
- #ifdef UNX
- 
--File GID_FILE_ALIASES_PANGOX
--	TXT_FILE_BODY;
--    Name            = "pangox.aliases";
--    Dir             = GID_DIR_PROGRAM;
--    Styles          = (PACKED);
--End
-+// File GID_FILE_ALIASES_PANGOX
-+// 	TXT_FILE_BODY;
-+//     Name            = "pangox.aliases";
-+//     Dir             = GID_DIR_PROGRAM;
-+//     Styles          = (PACKED);
-+// End
- 
- #endif
-