Mon Jan 20 19:26:40 2014 UTC ()
Make the genccode hack stick and apply similar workaround for gencmn.


(joerg)
diff -r1.11 -r1.12 pkgsrc/misc/libreoffice4/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/misc/libreoffice4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/Makefile 2014/01/10 20:07:50 1.11
+++ pkgsrc/misc/libreoffice4/Attic/Makefile 2014/01/20 19:26:40 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2014/01/10 20:07:50 joerg Exp $ 1# $NetBSD: Makefile,v 1.12 2014/01/20 19:26:40 joerg Exp $
2 2
3VER= 4.1.3.2 3VER= 4.1.3.2
4DISTNAME= libreoffice-${VER} 4DISTNAME= libreoffice-${VER}
5PKGNAME= libreoffice4-${VER} 5PKGNAME= libreoffice4-${VER}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.1.3/ 8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.1.3/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://www.libreoffice.org/ 12HOMEPAGE= http://www.libreoffice.org/
13COMMENT= Office productivity suite, 4.x branch 13COMMENT= Office productivity suite, 4.x branch
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
@@ -204,27 +204,28 @@ CONFIGURE_ARGS+= --without-system-beansh @@ -204,27 +204,28 @@ CONFIGURE_ARGS+= --without-system-beansh
204CONFIGURE_ARGS+= --without-system-vigra 204CONFIGURE_ARGS+= --without-system-vigra
205CONFIGURE_ARGS+= --with-vendor="pkgsrc" 205CONFIGURE_ARGS+= --with-vendor="pkgsrc"
206CONFIGURE_ARGS+= --without-doxygen 206CONFIGURE_ARGS+= --without-doxygen
207CONFIGURE_ARGS+= --without-junit 207CONFIGURE_ARGS+= --without-junit
208CONFIGURE_ARGS+= --without-krb5 208CONFIGURE_ARGS+= --without-krb5
209CONFIGURE_ARGS+= --without-gssapi 209CONFIGURE_ARGS+= --without-gssapi
210CONFIGURE_ARGS+= --without-system-apache-commons 210CONFIGURE_ARGS+= --without-system-apache-commons
211CONFIGURE_ARGS+= --with-system-cppunit 211CONFIGURE_ARGS+= --with-system-cppunit
212CONFIGURE_ARGS+= --without-system-jfreereport 212CONFIGURE_ARGS+= --without-system-jfreereport
213# internal sane should be used for effective developement. 213# internal sane should be used for effective developement.
214CONFIGURE_ARGS+= --without-system-sane 214CONFIGURE_ARGS+= --without-system-sane
215CONFIGURE_ARGS+= --without-system-servlet-api 215CONFIGURE_ARGS+= --without-system-servlet-api
216# sbin might not be in PATH 216# sbin might not be in PATH
217CONFIGURE_ARGS+= SYSTEM_GENCCODE=${BUILDLINK_PREFIX.icu}/sbin/genccode 217CONFIGURE_ARGS+= ac_cv_path_SYSTEM_GENCCODE=${BUILDLINK_PREFIX.icu}/sbin/genccode
 218CONFIGURE_ARGS+= ac_cv_path_SYSTEM_GENCMN=${BUILDLINK_PREFIX.icu}/sbin/gencmn
218 219
219# more REPLACE_PERL are needed. 220# more REPLACE_PERL are needed.
220REPLACE_PERL= sd/res/webview/editpic.pl 221REPLACE_PERL= sd/res/webview/editpic.pl
221REPLACE_PERL+= sd/res/webview/poll.pl 222REPLACE_PERL+= sd/res/webview/poll.pl
222REPLACE_PERL+= sd/res/webview/savepic.pl 223REPLACE_PERL+= sd/res/webview/savepic.pl
223REPLACE_PERL+= sd/res/webview/show.pl 224REPLACE_PERL+= sd/res/webview/show.pl
224REPLACE_PERL+= sd/res/webview/webview.pl 225REPLACE_PERL+= sd/res/webview/webview.pl
225 226
226LO_PROGRAMS= sbase scalc sdraw simpress smath soffice swriter 227LO_PROGRAMS= sbase scalc sdraw simpress smath soffice swriter
227# Base depends on java, we don't install the icon 228# Base depends on java, we don't install the icon
228LO_DESKTOP_FILES= calc.desktop draw.desktop impress.desktop math.desktop \ 229LO_DESKTOP_FILES= calc.desktop draw.desktop impress.desktop math.desktop \
229 startcenter.desktop writer.desktop 230 startcenter.desktop writer.desktop
230 231