summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2-devel
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /editors/openoffice.org-2-devel
parentUpdate to version 2.2.6 (diff)
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
Notes
Notes: svn path=/head/; revision=211584
Diffstat (limited to 'editors/openoffice.org-2-devel')
-rw-r--r--editors/openoffice.org-2-devel/Makefile5
-rw-r--r--editors/openoffice.org-2-devel/files/Makefile.localized2
2 files changed, 4 insertions, 3 deletions
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index a7f6af36e732..aa8489ad0651 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
+PORTREVISION= 1
PORTEPOCH?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -45,7 +46,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -126,7 +127,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT} \
+ imake:${PORTSDIR}/devel/imake \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2-devel/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"