1 files changed, 25 insertions, 20 deletions

diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 2f43dad7bcfb..0e946a934ee3 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,29 +7,32 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES+=	editors
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER} \
-		${MASTER_SITE_LOCAL:S/$/:moz/} \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/1.1.5/&,} \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/stable/1.1.5/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/stable/1.1.5/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/stable/1.1.5/\
 		ftp://ftp.tu-chemnitz.de/pub/openoffice/stable/1.1.5/ \
 		ftp://ftp.stardiv.de/pub/OpenOffice.org/stable/1.1.5/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/stable/1.1.5/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
+		${MASTER_SITE_LOCAL:S/$/:moz/} \
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
 		http://openoffice.lunarshells.com/sources/helpcontent/:help \
 		${MASTER_SITE_RINGSERVER:S/$/:help/} \
-		${MASTER_SITE_RINGSERVER:S/$/:help3/} \
+Jz		${MASTER_SITE_RINGSERVER:S/$/:help3/} \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
-MASTER_SITE_SUBDIR=	misc/openoffice/stable/1.1.5 \
-		maho/openoffice.org/:moz \
-		mozilla/releases/mozilla1.0/src/:mozsrc \
+MASTER_SITE_SUBDIR=	maho/openoffice.org/:moz \
+		mozilla/releases/mozilla${MOZILLA_VERSION}/src/:mozsrc \
 		misc/openoffice/contrib/helpcontent/:help \
 		misc/openoffice/contrib/helpcontent-1.0/:help3
-DISTFILES+=	OOo_${RELEASE_NR}_src.tar.gz gpc231.tar.Z:gpc
+DISTFILES+=	OOo_${RELEASE_NR}_src.tar.gz
+.if defined(WITH_GPC)
+DISTFILES+=	gpc231.tar.Z:gpc
+.endif
 EXTRACT_ONLY=	OOo_${RELEASE_NR}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
@@ -62,10 +65,6 @@ JAVA_VENDOR=	bsdjava
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} <= 492000)
-BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgrade your rtld"
-.endif
-
 LANG_EXT?=	01
 LANG_CONFIGURE_ARG?=	ENUS
 L10NHELP?=     helpcontent_01_unix.tgz
@@ -108,15 +107,15 @@ PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CC=	ccache gcc32
-CXX=	ccache g++32
+CC=	ccache gcc33
+CXX=	ccache g++33
 .else
-CC=	gcc32
-CXX=	g++32
+CC=	gcc33
+CXX=	g++33
 .endif
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -125,6 +124,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .endif
+.if !defined(WITH_GPC)
+LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
+.endif
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/OOo_${RELEASE_NR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
@@ -132,7 +134,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL
 
 .include <${FILESDIR}/Makefile.knobs>
 
@@ -157,9 +159,11 @@ post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
+.if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
+.endif
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
@@ -170,7 +174,7 @@ post-extract:
 	done
 .endif
 .if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch
+	@(cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch)
 	@${MKDIR} ${WRKSRC}/moz/download
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
@@ -257,3 +261,4 @@ solver:
 	@cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver
 
 .include <bsd.port.post.mk>
+