summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2007-02-28 12:06:58 +0000
committerhira <hira@pkgsrc.org>2007-02-28 12:06:58 +0000
commitd0c2387bc6dd472d03c014beec8cd500565e5514 (patch)
tree200cd560fdf4e3441f6fec67a3b422756477540f /misc
parentcab4579ed6fdec397b8f765ef3f85ffb6a85e659 (diff)
downloadpkgsrc-d0c2387bc6dd472d03c014beec8cd500565e5514.tar.gz
Force disable fltk in epm project. Fix build if x11/fltk is installed.
Problem reported and fix tested by oster@ in private e-mail.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice2/distinfo4
-rw-r--r--misc/openoffice2/patches/patch-bt27
-rw-r--r--misc/openoffice2/patches/patch-bu13
3 files changed, 43 insertions, 1 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 13d4967ed4a..bf5e3d74d0e 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: distinfo,v 1.2 2007/02/28 12:06:58 hira Exp $
SHA1 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc
RMD160 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a
@@ -51,3 +51,5 @@ SHA1 (patch-bp) = 4e5c31629ede238671aabeb1a08e3553739d0aa8
SHA1 (patch-bq) = 27b8895fba343f2a98cbb46462edec19cc5f5f7c
SHA1 (patch-br) = 63b33773923c6644f342813c6e07764e0da6b3e0
SHA1 (patch-bs) = cdb0e6f1fa5fa49e99c264996205dcd8cf8f9b66
+SHA1 (patch-bt) = 63fd761e7e1d540578a1d6eff9f6f8944e2749cb
+SHA1 (patch-bu) = d183549a349745000aff270b8ede592d85bc5155
diff --git a/misc/openoffice2/patches/patch-bt b/misc/openoffice2/patches/patch-bt
new file mode 100644
index 00000000000..347da196474
--- /dev/null
+++ b/misc/openoffice2/patches/patch-bt
@@ -0,0 +1,27 @@
+$NetBSD: patch-bt,v 1.1 2007/02/28 12:06:58 hira Exp $
+
+--- ../epm/epm-3.7.patch.orig 2007-02-28 11:29:52.000000000 +0900
++++ ../epm/epm-3.7.patch 2007-02-28 20:00:38.000000000 +0900
+@@ -697,3 +697,22 @@
+ }
+
+ --- 457,462 ----
++*** misc/epm-3.7/configure Wed Feb 28 11:36:52 2007
++--- misc/build/epm-3.7/configure Wed Feb 28 11:35:57 2007
++***************
++*** 4944,4950 ****
++ fi
++
++
++! if test "x$FLTKCONFIG" = x; then
++ GUIS=""
++ GUILIBS=""
++ INSTALL_GUIS=""
++--- 4944,4950 ----
++ fi
++
++
++! if test "x$FLTKCONFIG" = x -o x"$enable_fltk" == x"no"; then
++ GUIS=""
++ GUILIBS=""
++ INSTALL_GUIS=""
diff --git a/misc/openoffice2/patches/patch-bu b/misc/openoffice2/patches/patch-bu
new file mode 100644
index 00000000000..7458eb5b29e
--- /dev/null
+++ b/misc/openoffice2/patches/patch-bu
@@ -0,0 +1,13 @@
+$NetBSD: patch-bu,v 1.1 2007/02/28 12:06:59 hira Exp $
+
+--- ../epm/makefile.mk.orig 2007-02-28 09:29:28.000000000 +0900
++++ ../epm/makefile.mk 2007-02-28 20:00:46.000000000 +0900
+@@ -49,7 +49,7 @@
+
+ .IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO"
+
+-CONFIGURE_ACTION=.$/configure
++CONFIGURE_ACTION=.$/configure --disable-fltk
+ BUILD_ACTION=make
+ OUT2BIN=epm epminstall mkepmlist
+