[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Use external db4 and neon. Bump PKGR...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc/openoffice2 Use external db4 and neon. Bump PKGR...
From: hira <hira%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:29:57 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d139bdcc65d
branches:  trunk
changeset: 535438:6d139bdcc65d
user:      hira <hira%pkgsrc.org@localhost>
date:      Sat Nov 17 16:28:09 2007 +0000

description:
Use external db4 and neon.  Bump PKGREVISION.

diffstat:

 misc/openoffice2/Makefile               |  11 ++++++--
 misc/openoffice2/Makefile.NetBSD.x86_64 |   3 +-
 misc/openoffice2/distinfo               |   6 ++--
 misc/openoffice2/patches/patch-ba       |  39 +++++++++++++++++++++++++++++++-
 misc/openoffice2/patches/patch-cx       |  17 +++++++++++--
 5 files changed, 64 insertions(+), 12 deletions(-)

diffs (185 lines):

diff -r 20ea0f3aad44 -r 6d139bdcc65d misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Sat Nov 17 16:00:20 2007 +0000
+++ b/misc/openoffice2/Makefile Sat Nov 17 16:28:09 2007 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2007/11/11 15:46:25 hira Exp $
+# $NetBSD: Makefile,v 1.29 2007/11/17 16:28:09 hira Exp $
 #
 
 OO_VER=                        2.3.0
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=           ${DISTNAME}
@@ -54,7 +54,7 @@
 SUBST_STAGE.lib=       post-patch
 SUBST_MESSAGE.lib=     Adding library paths
 SUBST_FILES.lib=       solenv/inc/libs.mk
-.for pkg in expat jpeg zlib
+.for pkg in db4 expat jpeg zlib
 SUBST_SED.lib+=                -e 's,@BLNK_PREFIX_${pkg}@,${BUILDLINK_PREFIX.${pkg}},g'
 LIBS+=                 -L${BUILDLINK_PREFIX.${pkg}}/lib
 LIBS+=                 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
@@ -62,6 +62,7 @@
 
 CONFIGURE_ENV+=                LIBS=${LIBS:O:u:Q}
 CONFIGURE_ENV+=                X_LIBS=${X11_LDFLAGS:M*:Q}
+CONFIGURE_ENV+=                BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ENV+=                BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
 
 CONFIGURE_ARGS+=       --with-use-shell=bash
@@ -69,11 +70,13 @@
 CONFIGURE_ARGS+=       --enable-cairo
 CONFIGURE_ARGS+=       --disable-ldap
 CONFIGURE_ARGS+=       --with-system-stdlibs
+CONFIGURE_ARGS+=       --with-system-db
 CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --with-system-freetype
 CONFIGURE_ARGS+=       --with-system-jpeg
 CONFIGURE_ARGS+=       --with-system-libxml2
 CONFIGURE_ARGS+=       --with-system-libxslt
+CONFIGURE_ARGS+=       --with-system-neon
 CONFIGURE_ARGS+=       --with-system-python
 CONFIGURE_ARGS+=       --with-system-zlib
 
@@ -167,6 +170,7 @@
 PYTHON_VERSIONS_ACCEPTED=      24 23 22
 .include "../../lang/python/application.mk"
 
+.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
@@ -176,6 +180,7 @@
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../www/neon/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
diff -r 20ea0f3aad44 -r 6d139bdcc65d misc/openoffice2/Makefile.NetBSD.x86_64
--- a/misc/openoffice2/Makefile.NetBSD.x86_64   Sat Nov 17 16:00:20 2007 +0000
+++ b/misc/openoffice2/Makefile.NetBSD.x86_64   Sat Nov 17 16:28:09 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.x86_64,v 1.2 2007/11/11 03:35:35 hira Exp $
+# $NetBSD: Makefile.NetBSD.x86_64,v 1.3 2007/11/17 16:28:09 hira Exp $
 
 #OPENOFFICE_DLLSUFFIX= bx
 OPENOFFICE_OUTPATH=    unxbsdx3
@@ -9,3 +9,4 @@
 #  used when making a shared object; recompile with -fPIC
 #  /usr/lib/libsupc++.a: could not read symbols: Bad value
 USE_PKGSRC_GCC=                YES
+.include "../../mk/compiler.mk"
diff -r 20ea0f3aad44 -r 6d139bdcc65d misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Sat Nov 17 16:00:20 2007 +0000
+++ b/misc/openoffice2/distinfo Sat Nov 17 16:28:09 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2007/11/11 15:46:25 hira Exp $
+$NetBSD: distinfo,v 1.29 2007/11/17 16:28:09 hira Exp $
 
 SHA1 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = a45b356092fc61aba68d0b7536bb3f723cd62937
 RMD160 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 441a43c2a2d5418c9d3b55a89790f31598000bde
@@ -29,7 +29,7 @@
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 2745df4a4f7bcfed11ebf0048c76e5e2a5471da1
+SHA1 (patch-ba) = 5d282799df910ed8cb91e8d8f077f89955654018
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
@@ -64,4 +64,4 @@
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
-SHA1 (patch-cx) = 12bedb293cc3d930fb746884645816648caa2356
+SHA1 (patch-cx) = 4babf4ff88831db1967192ae33e6694410ea304c
diff -r 20ea0f3aad44 -r 6d139bdcc65d misc/openoffice2/patches/patch-ba
--- a/misc/openoffice2/patches/patch-ba Sat Nov 17 16:00:20 2007 +0000
+++ b/misc/openoffice2/patches/patch-ba Sat Nov 17 16:28:09 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.8 2007/11/11 15:46:25 hira Exp $
+$NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
 
 --- config_office/configure.orig       2007-08-24 21:31:18.000000000 +0900
-+++ config_office/configure    2007-11-12 00:42:00.000000000 +0900
++++ config_office/configure    2007-11-13 10:30:55.000000000 +0900
 @@ -3010,11 +3010,11 @@
                test_cups=no
                _os=OSF1
@@ -59,6 +59,41 @@
     fi
  
        save_CPPFLAGS="$CPPFLAGS"
+@@ -13090,7 +13090,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test $ac_cv_header_db_h = yes; then
+-   DB_INCLUDES=/usr/include
++   DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4
+ else
+ 
+              CFLAGS=-I/usr/include/db4
+@@ -13213,13 +13213,13 @@
+     #AC_CHECK_LIB(db, db_create, [],
+     #  [AC_MSG_ERROR([db library not installed or functional])], [])
+ 
+-echo "$as_me:$LINENO: checking for main in -ldb" >&5
+-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for main in -ldb4" >&5
++echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6
+ if test "${ac_cv_lib_db_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldb  $LIBS"
++LIBS="-ldb4  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13276,7 +13276,7 @@
+ #define HAVE_LIBDB 1
+ _ACEOF
+ 
+-  LIBS="-ldb $LIBS"
++  LIBS="-ldb4 $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
 @@ -18928,7 +18928,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
  echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
diff -r 20ea0f3aad44 -r 6d139bdcc65d misc/openoffice2/patches/patch-cx
--- a/misc/openoffice2/patches/patch-cx Sat Nov 17 16:00:20 2007 +0000
+++ b/misc/openoffice2/patches/patch-cx Sat Nov 17 16:28:09 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-cx,v 1.1 2007/11/11 03:35:36 hira Exp $
+$NetBSD: patch-cx,v 1.2 2007/11/17 16:28:09 hira Exp $
 
---- solenv/inc/libs.mk.orig    2007-11-09 05:07:41.000000000 +0900
-+++ solenv/inc/libs.mk 2007-11-09 05:19:45.000000000 +0900
+--- solenv/inc/libs.mk.orig    2007-07-31 22:06:06.000000000 +0900
++++ solenv/inc/libs.mk 2007-11-13 10:33:35.000000000 +0900
 @@ -187,14 +187,14 @@
  LINGULIB=$(HM2LIBST)
  LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
@@ -29,3 +29,14 @@
  .ENDIF
  .ELSE
  JPEG3RDLIB=-ljpeglib
+@@ -221,8 +221,8 @@
+ CURLLIB=-lcurl-3
+ .ELSE                 # "$(GUI)$(COM)"=="WNTGCC"
+ .IF "$(SYSTEM_DB)" == "YES"
+-BERKELEYLIB=-ldb
+-BERKELEYCPPLIB=-ldb_cxx
++BERKELEYLIB="-L@BLNK_PREFIX_db4@/lib -Wl,-R@BLNK_PREFIX_db4@/lib -ldb4"
++BERKELEYCPPLIB="-L@BLNK_PREFIX_db4@/lib -Wl,-R@BLNK_PREFIX_db4@/lib -ldb4_cxx"
+ .ELSE
+ BERKELEYLIB=-ldb-4.2
+ BERKELEYCPPLIB=-ldb_cxx-4.2
Prev by Date: [pkgsrc/trunk]: pkgsrc/emulators/compat_netbsd Make PKGNAME consistent across...
Next by Date: [pkgsrc/trunk]: pkgsrc/mbone/beacon This package's configure script wants to ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/emulators/compat_netbsd Make PKGNAME consistent across...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mbone/beacon This package's configure script wants to ...
Indexes:
Home | Main Index | Thread Index | Old Index