Sun May 11 07:21:51 2008 UTC ()
Use REPLACE_PYTHON instead of subst framework.


(hira)
diff -r1.43 -r1.44 pkgsrc/misc/openoffice2/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/misc/openoffice2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/Makefile 2008/04/25 20:39:10 1.43
+++ pkgsrc/misc/openoffice2/Attic/Makefile 2008/05/11 07:21:51 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2008/04/25 20:39:10 joerg Exp $ 1# $NetBSD: Makefile,v 1.44 2008/05/11 07:21:51 hira Exp $
2# 2#
3 3
4OO_VER= 2.4.0 4OO_VER= 2.4.0
5DISTNAME= openoffice-${OO_VER} 5DISTNAME= openoffice-${OO_VER}
6PKGNAME= openoffice2-${OO_VER} 6PKGNAME= openoffice2-${OO_VER}
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} 8MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
9DIST_SUBDIR= ${DISTNAME} 9DIST_SUBDIR= ${DISTNAME}
10 10
11DISTFILES= OOo_${OO_VER}_src_core.tar.bz2 11DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
12DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2 12DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
13DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2 13DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2
14#DISTFILES+= OOo_${OO_VER}_src_sdk.tar.bz2 14#DISTFILES+= OOo_${OO_VER}_src_sdk.tar.bz2
@@ -42,42 +42,38 @@ PTHREAD_AUTO_VARS= yes @@ -42,42 +42,38 @@ PTHREAD_AUTO_VARS= yes
42 42
43CONFLICTS+= staroffice-[0-9]* 43CONFLICTS+= staroffice-[0-9]*
44CONFLICTS+= openoffice-[0-9]* 44CONFLICTS+= openoffice-[0-9]*
45CONFLICTS+= openoffice-bin-[0-9]* 45CONFLICTS+= openoffice-bin-[0-9]*
46CONFLICTS+= openoffice2-bin-[0-9]* 46CONFLICTS+= openoffice2-bin-[0-9]*
47CONFLICTS+= openoffice-linux-[0-9]* 47CONFLICTS+= openoffice-linux-[0-9]*
48 48
49ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64 49ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64
50ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386 50ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
51ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64 51ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
52 52
53GNU_CONFIGURE= yes 53GNU_CONFIGURE= yes
54 54
 55REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py
 56
55SUBST_CLASSES+= lib 57SUBST_CLASSES+= lib
56SUBST_STAGE.lib= post-patch 58SUBST_STAGE.lib= post-patch
57SUBST_MESSAGE.lib= Adding library paths 59SUBST_MESSAGE.lib= Adding library paths
58SUBST_FILES.lib= solenv/inc/libs.mk 60SUBST_FILES.lib= solenv/inc/libs.mk
59.for pkg in db4 expat jpeg zlib 61.for pkg in db4 expat jpeg zlib
60SUBST_SED.lib+= -e 's,@BLNK_PREFIX_${pkg}@,${BUILDLINK_PREFIX.${pkg}},g' 62SUBST_SED.lib+= -e 's,@BLNK_PREFIX_${pkg}@,${BUILDLINK_PREFIX.${pkg}},g'
61LIBS+= -L${BUILDLINK_PREFIX.${pkg}}/lib 63LIBS+= -L${BUILDLINK_PREFIX.${pkg}}/lib
62LIBS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib 64LIBS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
63.endfor 65.endfor
64 66
65SUBST_CLASSES+= python 
66SUBST_STAGE.python= post-patch 
67SUBST_MESSAGE.python= Fix python path 
68SUBST_FILES.python= scripting/source/pyprov/mailmerge.py 
69SUBST_SED.python+= -e 's,^\#!/bin/python$$,\#!${PYTHONBIN:Q},' 
70 
71CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q} 67CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q}
72CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q} 68CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q}
73CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4} 69CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
74CONFIGURE_ENV+= BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas} 70CONFIGURE_ENV+= BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
75 71
76CONFIGURE_ARGS+= --with-use-shell=bash 72CONFIGURE_ARGS+= --with-use-shell=bash
77CONFIGURE_ARGS+= --enable-binfilter 73CONFIGURE_ARGS+= --enable-binfilter
78CONFIGURE_ARGS+= --enable-cairo 74CONFIGURE_ARGS+= --enable-cairo
79CONFIGURE_ARGS+= --disable-ldap 75CONFIGURE_ARGS+= --disable-ldap
80CONFIGURE_ARGS+= --with-system-stdlibs 76CONFIGURE_ARGS+= --with-system-stdlibs
81CONFIGURE_ARGS+= --with-system-curl 77CONFIGURE_ARGS+= --with-system-curl
82CONFIGURE_ARGS+= --with-system-db 78CONFIGURE_ARGS+= --with-system-db
83CONFIGURE_ARGS+= --with-system-expat 79CONFIGURE_ARGS+= --with-system-expat