diff options
author | jlam <jlam> | 2007-07-29 05:18:36 +0000 |
---|---|---|
committer | jlam <jlam> | 2007-07-29 05:18:36 +0000 |
commit | c79d13574d40ad8e282bd93bd622e8a195903691 (patch) | |
tree | 45cad36d8470a568b9136017b2dd79c9efcc65bc /emulators/suse91_gtk2 | |
parent | a9d6b45cddcb11e05e29eed50a9623fff3d06518 (diff) | |
download | pkgsrc-c79d13574d40ad8e282bd93bd622e8a195903691.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 'emulators/suse91_gtk2')
-rw-r--r-- | emulators/suse91_gtk2/DEINSTALL | 15 | ||||
-rw-r--r-- | emulators/suse91_gtk2/DESCR | 9 | ||||
-rw-r--r-- | emulators/suse91_gtk2/INSTALL | 16 | ||||
-rw-r--r-- | emulators/suse91_gtk2/Makefile | 30 | ||||
-rw-r--r-- | emulators/suse91_gtk2/Makefile.i386 | 6 | ||||
-rw-r--r-- | emulators/suse91_gtk2/Makefile.x86_64 | 6 | ||||
-rw-r--r-- | emulators/suse91_gtk2/PLIST | 4 | ||||
-rw-r--r-- | emulators/suse91_gtk2/suse.i386.mk | 7 | ||||
-rw-r--r-- | emulators/suse91_gtk2/suse.x86_64.mk | 7 |
9 files changed, 50 insertions, 50 deletions
diff --git a/emulators/suse91_gtk2/DEINSTALL b/emulators/suse91_gtk2/DEINSTALL new file mode 100644 index 00000000000..d90af144902 --- /dev/null +++ b/emulators/suse91_gtk2/DEINSTALL @@ -0,0 +1,15 @@ +# $NetBSD: DEINSTALL,v 1.3 2007/07/29 05:19:12 jlam Exp $ +# +# Remove gtk/pango module configuration. +# +case ${STAGE} in +DEINSTALL) + GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin" + GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome" + + ${ECHO} "${PKGNAME}: removing GTK/Pango module configuration" + ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules + ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders + ${RM} -f ${GNOME_ETCDIR}/pango/pango.modules + ;; +esac diff --git a/emulators/suse91_gtk2/DESCR b/emulators/suse91_gtk2/DESCR index 962f8891e8f..bc684571d53 100644 --- a/emulators/suse91_gtk2/DESCR +++ b/emulators/suse91_gtk2/DESCR @@ -1,5 +1,6 @@ -Linux compatibility package based on the SuSE Linux distribution, take a -look at "http://www.suse.com/" for more information about it. +Linux compatibility package based on the SuSE Linux distribution. +Please visit http://www.suse.com/ for more information about SuSE +Linux. -This package supports running ELF binaries linked with glibc2 which require -GTK2 shared libraries. +This package supports running ELF binaries linked with glibc2 that +require GTK+-2.x shared libraries. diff --git a/emulators/suse91_gtk2/INSTALL b/emulators/suse91_gtk2/INSTALL index 57074111b3b..6af096e2eb8 100644 --- a/emulators/suse91_gtk2/INSTALL +++ b/emulators/suse91_gtk2/INSTALL @@ -1,15 +1,17 @@ -# $NetBSD: INSTALL,v 1.3 2005/01/22 12:35:26 jdolecek Exp $ +# $NetBSD: INSTALL,v 1.4 2007/07/29 05:19:13 jlam Exp $ # # Initialize gtk/pango module configuration. # case ${STAGE} in - POST-INSTALL) - @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0 > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules +POST-INSTALL) + GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin" + GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome" - @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders + ${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration" + ${GNOME_BINDIR}/gtk-query-immodules-2.0> ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules - @EMULDIR@/opt/gnome/bin/pango-querymodules > @EMULDIR@/etc/opt/gnome/pango/pango.modules - ;; - *) + ${GNOME_BINDIR}/gdk-pixbuf-query-loaders> ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders + + ${GNOME_BINDIR}/pango-querymodules> ${GNOME_ETCDIR}/pango/pango.modules ;; esac diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile index 4fd11bc002c..4fe3c8c9b4c 100644 --- a/emulators/suse91_gtk2/Makefile +++ b/emulators/suse91_gtk2/Makefile @@ -1,33 +1,17 @@ -# $NetBSD: Makefile,v 1.17 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:13 jlam Exp $ -DISTNAME= suse_gtk2-${SUSE_VERSION} -PKGREVISION= 6 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_gtk2-${SUSE_VERSION} +PKGREVISION= 7 +CATEGORIES= emulators -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for GTK2 binaries +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for GTK+-2.x -DEPENDS+= suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse91_fontconfig -DEPENDS+= suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2 -DEPENDS+= suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libjpeg -DEPENDS+= suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libpng -DEPENDS+= suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libtiff -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +EMUL_MODULES.linux= fontconfig freetype2 jpeg png tiff x11 # Initialize gtk/pango modules. FILES_SUBST+= EMULDIR=${EMULDIR:Q} PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif - .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_gtk2/Makefile.i386 b/emulators/suse91_gtk2/Makefile.i386 deleted file mode 100644 index 4cbf5d93abf..00000000000 --- a/emulators/suse91_gtk2/Makefile.i386 +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= atk-1.4.1-124.${SUSE_ARCH}.rpm \ - glib2-2.2.3-117.${SUSE_ARCH}.rpm \ - gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \ - pango-1.2.5-170.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk2/Makefile.x86_64 b/emulators/suse91_gtk2/Makefile.x86_64 deleted file mode 100644 index 8af27512fae..00000000000 --- a/emulators/suse91_gtk2/Makefile.x86_64 +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= atk-1.4.1-104.${SUSE_ARCH}.rpm \ - glib2-2.2.3-106.${SUSE_ARCH}.rpm \ - gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \ - pango-1.2.5-148.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk2/PLIST b/emulators/suse91_gtk2/PLIST deleted file mode 100644 index 92b8a7ab074..00000000000 --- a/emulators/suse91_gtk2/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2005/01/22 12:35:26 jdolecek Exp $ -${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules -${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders -${EMULSUBDIR}/etc/opt/gnome/pango/pango.modules diff --git a/emulators/suse91_gtk2/suse.i386.mk b/emulators/suse91_gtk2/suse.i386.mk new file mode 100644 index 00000000000..b1b46d68d3a --- /dev/null +++ b/emulators/suse91_gtk2/suse.i386.mk @@ -0,0 +1,7 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:14 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES+= atk-1.4.1-124.${SUSE_ARCH}.rpm +DISTFILES+= glib2-2.2.3-117.${SUSE_ARCH}.rpm +DISTFILES+= gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm +DISTFILES+= pango-1.2.5-170.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk2/suse.x86_64.mk b/emulators/suse91_gtk2/suse.x86_64.mk new file mode 100644 index 00000000000..bedc20ae84e --- /dev/null +++ b/emulators/suse91_gtk2/suse.x86_64.mk @@ -0,0 +1,7 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:14 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES+= atk-1.4.1-104.${SUSE_ARCH}.rpm +DISTFILES+= glib2-2.2.3-106.${SUSE_ARCH}.rpm +DISTFILES+= gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm +DISTFILES+= pango-1.2.5-148.${SUSE_ARCH}.rpm |