diff options
author | jlam <jlam@pkgsrc.org> | 2007-07-29 05:18:36 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2007-07-29 05:18:36 +0000 |
commit | 33f30156fb37245b360bbc293320402ecf1aba41 (patch) | |
tree | 45cad36d8470a568b9136017b2dd79c9efcc65bc /misc/openoffice2-bin | |
parent | ffe106498e5f63e2e945d5b6b2ac8807a10ae78f (diff) | |
download | pkgsrc-33f30156fb37245b360bbc293320402ecf1aba41.tar.gz |
* Add new emulator framework in pkgsrc/mk/emulator that handles all
binary-only packages that require binary "emulation" on the native
operating system. Please see pkgsrc/mk/emulator/README for more
details.
* Teach the plist framework to automatically use any existing
PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition.
* Convert all of the binary-only packages in pkgsrc to use the
emulator framework. Most of them have been tested to install and
deinstall correctly. This involves the following cleanup actions:
* Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM}
more consistently.
* Simplify packages by using default INSTALL and DEINSTALL scripts
instead of custom INSTALL/DEINSTALL code.
* Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc.
Packages only need to state exactly which emulations they support,
and the framework handles any i386-on-x86_64 or sparc-on-sparc64
uses.
* Remove "USE_NATIVE_LINUX" from pkgsrc. The framework will
automatically detect when the package is installing on Linux.
Specific changes to packages include:
* Bump the PKGREVISIONs for all of the suse100* and suse91* packages
due to changes in the +INSTALL/+DEINSTALL scripts used in all
of the packages.
* Remove pkgsrc/emulators/suse_linux, which is unused by any
packages.
* cad/lc -- remove custom code to create the distinfo file for
all supported platforms; just use "emul-fetch" and "emul-distinfo"
instead.
* lang/Cg-compiler -- install the shared libraries under ${EMULDIR}
instead of ${PREFIX}/lib so that compiled programs will find
the shared libraries.
* mail/thunderbird-bin-nightly -- update to latest binary
distributions for supported platforms.
* multimedia/ns-flash -- update Linux version to 9.0.48 as the
older version is no longer available for interactive fetch.
* security/uvscan -- set LD_LIBRARY_PATH explicitly so that
it's not necessary to install library symlinks into
${EMULDIR}/usr/local/lib.
* www/firefox-bin-flash -- update Linux version to 9.0.48 as the
older version is no longer available for interactive fetch.
Diffstat (limited to 'misc/openoffice2-bin')
-rw-r--r-- | misc/openoffice2-bin/Makefile | 88 | ||||
-rw-r--r-- | misc/openoffice2-bin/Makefile.DragonFly.i386 | 7 | ||||
-rw-r--r-- | misc/openoffice2-bin/Makefile.NetBSD.i386 | 7 |
3 files changed, 30 insertions, 72 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index c51afbc93b9..ad15887437d 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,90 +1,62 @@ -# $NetBSD: Makefile,v 1.29 2007/06/20 18:15:31 tron Exp $ +# $NetBSD: Makefile,v 1.30 2007/07/29 05:19:40 jlam Exp $ +DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mrauch@NetBSD.org HOMEPAGE= http://www.openoffice.org/ COMMENT= Integrated office productivity suite (binary pkg) -BUILD_DEPENDS+= rpm2pkg>=2.1:../../pkgtools/rpm2pkg - -RPM2PKG= ${PREFIX}/sbin/rpm2pkg -RPM2PKGARGS= -d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1 - -OO_VER= 2.2 -OO_RELEASE= 2.2.1 -PLIST_SUBST+= VER=${OO_VER:Q} -MESSAGE_SUBST+= VER=${OO_VER:Q} -FILES_SUBST+= VER=${OO_VER:Q} - -NO_CONFIGURE= yes -NO_BUILD= yes - CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* -ONLY_FOR_PLATFORM= NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 DragonFly-*-i386 +OO_VER= 2.2 +OO_RELEASE= 2.2.1 +PLIST_SUBST+= VER=${OO_VER:Q} +MESSAGE_SUBST+= VER=${OO_VER:Q} +FILES_SUBST+= VER=${OO_VER:Q} TEMP?= ${WRKSRC} -CHECK_SHLIBS_SUPPORTED= no +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +BUILD_DIRS= # empty PLIST_SRC= ${PKGDIR}/PLIST.proglinks PLIST_SRC+= ${WRKDIR}/PLIST -.include "../../mk/bsd.prefs.mk" - -# group together i386, i486, i586 and i686 (for Linux) -# -ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} +EMUL_PLATFORMS= linux-i386 +#EMUL_PLATFORMS+= solaris-i386 solaris-sparc +EMUL_MODULES.linux= compat freetype2 x11 +SUSE_VERSION_REQD= 7.3 -.if ${OPSYS} == "NetBSD" -DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US -WRKSRC= ${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161 -.endif +EMUL_PKG_FMT= rpm +RPMFILES= ${WRKSRC}/RPMS/*.rpm +RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_SUBPREFIX= ${EMULSUBDIR} +RPM2PKG_STAGE= do-install +RUN_LDCONFIG= no -.if ${OPSYS} == "DragonFly" -DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US -WRKSRC= ${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161 -.endif - -.if ${OPSYS} == "Linux" -.if ${ARCH} == "i386" -DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US -WRKSRC= ${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161 -.endif -.endif - -.if ${OPSYS} == "SunOS" -.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" -DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US -WRKSRC= ${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages -.elif ${MACHINE_ARCH} == "i386" -DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US -WRKSRC= ${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages -.endif -.endif - -# everything specific to your OS/Arch goes into its own Makefile +.include "../../mk/bsd.prefs.mk" -.if exists(Makefile.${OPSYS}.${ARCH}) -. include "Makefile.${OPSYS}.${ARCH}" +.if ${EMUL_PLATFORM} == "linux-i386" +DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US +WRKSRC= ${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161 +.elif ${EMUL_PLATFORM} == "solaris-i386" +DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US +WRKSRC= ${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages +.elif ${EMUL_PLATFORM} == "solaris-sparc" +DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US +WRKSRC= ${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages .endif -DISTNAME?= OOo_${OO_RELEASE}_LinuxIntel_install_en-US - .include "options.mk" do-install: - ${RM} -f ${WRKDIR}/PLIST.nouniq - ${RPM2PKG} ${RPM2PKGARGS} ${WRKSRC}/RPMS/*.rpm - uniq ${WRKDIR}/PLIST.nouniq >${WRKDIR}/PLIST + uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST .if defined(PKG_JVM) && !empty(PKG_JVM) ${RM} -f ${PREFIX}/bin/soffice ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ diff --git a/misc/openoffice2-bin/Makefile.DragonFly.i386 b/misc/openoffice2-bin/Makefile.DragonFly.i386 deleted file mode 100644 index f5c438da215..00000000000 --- a/misc/openoffice2-bin/Makefile.DragonFly.i386 +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: Makefile.DragonFly.i386,v 1.2 2006/07/02 09:28:37 ghen Exp $ - -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_freetype2>=2.0:../../emulators/${SUSE_DIR_PREFIX}_freetype2 - -.include "../../emulators/suse_linux/Makefile.application" diff --git a/misc/openoffice2-bin/Makefile.NetBSD.i386 b/misc/openoffice2-bin/Makefile.NetBSD.i386 deleted file mode 100644 index d16dff20592..00000000000 --- a/misc/openoffice2-bin/Makefile.NetBSD.i386 +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.3 2006/07/02 09:28:37 ghen Exp $ - -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_freetype2>=2.0:../../emulators/${SUSE_DIR_PREFIX}_freetype2 - -.include "../../emulators/suse_linux/Makefile.application" |