ports/148918: [patch] editors/openoffice.org-3-devel/Makefile fixes

[Martin Birgmeier]

>Number:         148918
>Category:       ports
>Synopsis:       [patch] editors/openoffice.org-3-devel/Makefile fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 25 08:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Birgmeier
>Release:        7.3, 8.0, 8.1
>Organization:
MBi at home
>Environment:
FreeBSD atpcdvvc.xyzzy 7.3-RELEASE-p2 FreeBSD 7.3-RELEASE-p2 #0: Sat Jul 24 13:41:31 CEST 2010     root at atpcdvvc.xyzzy:/usr/VOL/OBJ/FreeBSD/RELENG_7_3/src/sys/XYZZY_SMP_NA  i386
>Description:
There are a few issues with openoffice.org Makefiles, specifically with openoffice.org-3-devel and openoffice.org-3-RC. Patches are attached.
>How-To-Repeat:
Build openoffice.org-3-devel.
>Fix:
See attached patch.

Patch attached with submission follows:

--- /usr/ports/editors/openoffice.org-3-devel/Makefile.ORIG	2010-07-24 19:46:11.000000000 +0200
+++ /usr/ports/editors/openoffice.org-3-devel/Makefile	2010-07-25 10:04:38.000000000 +0200
@@ -12,7 +12,7 @@
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-DISTFILES+=	${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
+DISTFILES+=	${OOOSRC} ${OOOEXTSRC}:extsrc unowinreg.dll:unowinreg
 
 #de facto maintainer is maho at FreeBSD.org
 #patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy
@@ -21,9 +21,9 @@
 
 CONFLICTS=	cppunit*
 
-EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
+EXTRACT_ONLY?=	${OOOSRC} ${OOOEXTSRC}
 
-OOOEXTSRC=	ext_sources.20100718.tar.bz2:extsrc
+OOOEXTSRC=	ext_sources.20100718.tar.bz2
 
 .if defined(CWS)
 PORTNAME:=	openoffice.org-${CWS}


>Release-Note:
>Audit-Trail:
>Unformatted: