[pkgsrc/trunk]: pkgsrc/misc/openoffice2 - Fix python path in installed script.

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95f9b3d6e512
branches:  trunk
changeset: 536900:95f9b3d6e512
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Dec 28 04:47:03 2007 +0000

description:
- Fix python path in installed script.
   Pointing out by veego@ in private e-mail.
 - Make this build with gcc4 on NetBSD/amd64 (don't link libsupc++.a
   with gcc>=4).  Suggested by joerg@.  Tested by Paul Goyatte
   <paul at whooppee dot com> and smb@.

diffstat:

 misc/openoffice2/Makefile               |   9 ++++++++-
 misc/openoffice2/Makefile.NetBSD.x86_64 |   9 +--------
 misc/openoffice2/distinfo               |   3 ++-
 misc/openoffice2/patches/patch-cy       |  15 +++++++++++++++
 4 files changed, 26 insertions(+), 10 deletions(-)

diffs (76 lines):

diff -r 3dff046068fc -r 95f9b3d6e512 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Fri Dec 28 04:22:43 2007 +0000
+++ b/misc/openoffice2/Makefile Fri Dec 28 04:47:03 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/12/24 02:07:10 hira Exp $
+# $NetBSD: Makefile,v 1.33 2007/12/28 04:47:03 hira Exp $
 #
 
 OO_VER=                        2.3.1
+PKGREVISION=           1
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
 CATEGORIES=            misc
@@ -59,6 +60,12 @@
 LIBS+=                 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
 .endfor
 
+SUBST_CLASSES+=                python
+SUBST_STAGE.python=    post-patch
+SUBST_MESSAGE.python=  Fix python path
+SUBST_FILES.python=    scripting/source/pyprov/mailmerge.py
+SUBST_SED.python+=     -e 's,^\#!/bin/python$$,\#!${PYTHONBIN:Q},'
+
 CONFIGURE_ENV+=                LIBS=${LIBS:O:u:Q}
 CONFIGURE_ENV+=                X_LIBS=${X11_LDFLAGS:M*:Q}
 CONFIGURE_ENV+=                BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
diff -r 3dff046068fc -r 95f9b3d6e512 misc/openoffice2/Makefile.NetBSD.x86_64
--- a/misc/openoffice2/Makefile.NetBSD.x86_64   Fri Dec 28 04:22:43 2007 +0000
+++ b/misc/openoffice2/Makefile.NetBSD.x86_64   Fri Dec 28 04:47:03 2007 +0000
@@ -1,12 +1,5 @@
-# $NetBSD: Makefile.NetBSD.x86_64,v 1.3 2007/11/17 16:28:09 hira Exp $
+# $NetBSD: Makefile.NetBSD.x86_64,v 1.4 2007/12/28 04:47:04 hira Exp $
 
 #OPENOFFICE_DLLSUFFIX= bx
 OPENOFFICE_OUTPATH=    unxbsdx3
 OPENOFFICE_SETFILE=    NetBSDX86-64
-
-# Is /usr/lib/libsupc++.a broken (-current and 4.0_BETA2) ?
-#  /usr/bin/ld: /usr/lib/libsupc++.a(pure.o): relocation R_X86_64_32 can not be
-#  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 3dff046068fc -r 95f9b3d6e512 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Fri Dec 28 04:22:43 2007 +0000
+++ b/misc/openoffice2/distinfo Fri Dec 28 04:47:03 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2007/12/24 02:07:10 hira Exp $
+$NetBSD: distinfo,v 1.32 2007/12/28 04:47:04 hira Exp $
 
 SHA1 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 0643c52da3850a164928342e7651897b7a76ca1f
 RMD160 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 497aec1de49ea941ab8305331a9fc9e8e04a5162
@@ -65,3 +65,4 @@
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
 SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
+SHA1 (patch-cy) = 89ded172ede9d7f998407c9a0ecd6f22207da49f
diff -r 3dff046068fc -r 95f9b3d6e512 misc/openoffice2/patches/patch-cy
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/patches/patch-cy Fri Dec 28 04:47:03 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cy,v 1.1 2007/12/28 04:47:04 hira Exp $
+
+--- store/util/makefile.mk.orig        2007-12-26 19:02:55.000000000 +0900
++++ store/util/makefile.mk     2007-12-26 19:04:32.000000000 +0900
+@@ -79,9 +79,7 @@
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS+=         -lsupc++
+ .ELSE
+-.IF "$(OS)"=="NETBSD"
+-SHL1STDLIBS+=         -lsupc++
+-.ELIF "$(OS)"=="MACOSX"
++.IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
+ .IF "$(CCNUMVER)"<="000399999999"
+ SHL1STDLIBS+= -lsupc++
+ .ENDIF # CCNUMVER