diff options
Diffstat (limited to 'emulators')
252 files changed, 1784 insertions, 1907 deletions
diff --git a/emulators/m1/Makefile b/emulators/m1/Makefile index 9758c7eca94..070cafcf8b3 100644 --- a/emulators/m1/Makefile +++ b/emulators/m1/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/15 13:31:28 wiz Exp $ -# +# $NetBSD: Makefile,v 1.9 2007/07/29 05:18:37 jlam Exp $ DISTNAME= m1074b2-lnx PKGNAME= m1-0.7.4c @@ -12,16 +11,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.emuhype.com/index.phtml?s=misc&ss=index COMMENT= Arcade video and pinball game sound emulator (Linux binary) -.include "../../emulators/suse_linux/Makefile.application" +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= compat -.if !defined(USE_NATIVE_LINUX) -DEPENDS+= suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat -.endif - -ONLY_FOR_PLATFORM= *-*-i386 - -WRKSRC= ${WRKDIR}/m1-0.7.4 -NO_BUILD= yes +WRKSRC= ${WRKDIR}/m1-0.7.4 +BUILD_DIRS= # empty INSTALLATION_DIRS= bin diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index 98957bfc71a..456e01318e9 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:53 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/29 05:18:37 jlam Exp $ DISTNAME= ski-0.9.81-l6-i686 PKGNAME= ski-0.9.81.6 @@ -15,17 +15,14 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -ONLY_FOR_PLATFORM= *-*-i386 - -.include "../../emulators/suse_linux/Makefile.application" - -.if !defined(USE_NATIVE_LINUX) -DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= x11 WRKSRC= ${WRKDIR} -INTERACTIVE_STAGE= fetch extract -NO_BUILD= YES +INTERACTIVE_STAGE= fetch +BUILD_DIRS= # none + +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 lib/X11/app-defaults DOWNLOAD= http://www.hpl.hp.com/research/linux/ski/download.php @@ -38,7 +35,9 @@ FETCH_MESSAGE= \ do-install: ${INSTALL_PROGRAM} ${WRKDIR}/nue/usr/bin/*ski* ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki ${PREFIX}/lib/X11/app-defaults/XSki + ${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 \ + ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki \ + ${PREFIX}/lib/X11/app-defaults/XSki .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_aspell/DESCR b/emulators/suse100_aspell/DESCR index 32264c795f3..afa9ec2124a 100644 --- a/emulators/suse100_aspell/DESCR +++ b/emulators/suse100_aspell/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 -aspell libraries. +This package supports running ELF binaries linked with glibc2 that +require aspell shared libraries. diff --git a/emulators/suse100_aspell/Makefile b/emulators/suse100_aspell/Makefile index 67a20c31a90..0898b64a7ef 100644 --- a/emulators/suse100_aspell/Makefile +++ b/emulators/suse100_aspell/Makefile @@ -1,24 +1,14 @@ -# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:38 jlam Exp $ -DISTNAME= suse_aspell-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_aspell-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators +DISTFILES= aspell-0.60.3-2.${SUSE_ARCH}.rpm -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for Aspell library +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for aspell -.if !defined(USE_NATIVE_LINUX) -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base -.endif - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_aspell/Makefile.i386 b/emulators/suse100_aspell/Makefile.i386 deleted file mode 100644 index 15174f4f040..00000000000 --- a/emulators/suse100_aspell/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $ - -RPMFILES= aspell-0.60.3-2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_aspell/Makefile.powerpc b/emulators/suse100_aspell/Makefile.powerpc deleted file mode 100644 index a63b54a46b2..00000000000 --- a/emulators/suse100_aspell/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $ - -RPMFILES= aspell-0.60.3-2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_aspell/Makefile.x86_64 b/emulators/suse100_aspell/Makefile.x86_64 deleted file mode 100644 index eb67615315a..00000000000 --- a/emulators/suse100_aspell/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $ - -RPMFILES= aspell-0.60.3-2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_base/DEINSTALL b/emulators/suse100_base/DEINSTALL new file mode 100644 index 00000000000..e37a030b640 --- /dev/null +++ b/emulators/suse100_base/DEINSTALL @@ -0,0 +1,27 @@ +# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:18:38 jlam Exp $ + +EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@" + +case "${STAGE}" in +DEINSTALL) + # Run any actions that require root privileges. + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1 + + # Blow away the /proc directory + ${RM} -fr ${EMULDIR}/proc + + # Remove a stray symlink that would normally be managed by + # ldconfig(8). + # + ${RM} -f ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1 + + # Remove some files created by pkgsrc. + ${RM} -f ${EMULDIR}/etc/ld.so.cache + ${RM} -f ${EMULDIR}/etc/mtab + ${RM} -f ${EMULDIR}/etc/group + ${RM} -f ${EMULDIR}/etc/gshadow + ${RM} -f ${EMULDIR}/etc/passwd + ${RM} -f ${EMULDIR}/etc/shadow + ;; +esac diff --git a/emulators/suse100_base/DESCR b/emulators/suse100_base/DESCR index 62e5a3f87e9..fa773614562 100644 --- a/emulators/suse100_base/DESCR +++ b/emulators/suse100_base/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 don't -require X11 shared libraries. +This package supports running ELF binaries linked with glibc2 that +don't require X11 shared libraries. diff --git a/emulators/suse100_base/INSTALL b/emulators/suse100_base/INSTALL index ed22f89412e..51371f21458 100644 --- a/emulators/suse100_base/INSTALL +++ b/emulators/suse100_base/INSTALL @@ -1,30 +1,149 @@ -# $NetBSD: INSTALL,v 1.4 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: INSTALL,v 1.5 2007/07/29 05:18:39 jlam Exp $ -case "${STAGE}" in -POST-INSTALL) - emulsubdir="@OPSYS_EMULSUBDIR@" +# Generate a +ROOT_ACTIONS script that runs certain actions that require +# superuser privileges. +# +case "${STAGE},$1" in +UNPACK,|UNPACK,+ROOT_ACTIONS) + ${CAT} > ./+ROOT_ACTIONS << 'EOF' +#!@SH@ +# +# +ROOT_ACTIONS - run actions requiring superuser privileges +# +# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir] +# +# This script runs certain actions that require superuser privileges. +# If such privileges are not available, then simply output a message +# asking the user to run this script with the appropriate elevated +# privileges. +# + +CAT="@CAT@" +CHMOD="@CHMOD@" +CP="@CP@" +ECHO="@ECHO@" +ID="@ID@" +LN="@LN@" +MKDIR="@MKDIR@" +PWD_CMD="@PWD_CMD@" +RM="@RM@" +SH="@SH@" +TEST="@TEST@" + +SELF=$0 +ACTION=$1 + +CURDIR=`${PWD_CMD}` +PKG_METADATA_DIR="${2-${CURDIR}}" +: ${PKGNAME=${PKG_METADATA_DIR##*/}} +: ${PKG_PREFIX=@PREFIX@} - emuldir="@OPSYS_EMULDIR@" - pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir" +EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@" +OPSYS_EMULDIR="@OPSYS_EMULDIR@" - emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}` - pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}` +ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done" +EUID=`${ID} -u` - if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then - if ${TEST} -e $emuldir -o -L $emuldir; then - ${CAT} << EOF +exitcode=0 +case $ACTION,$EUID in +ADD,0) + ${ECHO} "" > ${ROOT_ACTIONS_COOKIE} + ${CHMOD} g+w ${ROOT_ACTIONS_COOKIE} + # Create an appropriate Linux-like /dev directory. + ${ECHO} "${PKGNAME}: populating ${EMULDIR}/dev" + ${MKDIR} ${EMULDIR}/dev + ${TEST} ! -f /dev/MAKEDEV || + ${CP} /dev/MAKEDEV ${EMULDIR}/dev + ${TEST} ! -f /dev/MAKEDEV.subr || + ${CP} /dev/MAKEDEV.subr ${EMULDIR}/dev + ( cd ${EMULDIR}/dev && + ${SH} ./MAKEDEV std audio && + ${LN} -fs sound dsp ) + + # Create the appropriate symlink so that the kernel will + # find the installed files. + # + OPSYS_EMULDIR_PWD=`cd ${OPSYS_EMULDIR} 2>/dev/null && ${PWD_CMD}` + EMULDIR_PWD=`cd ${EMULDIR} 2>/dev/null && ${PWD_CMD}` + + if ${TEST} "${OPSYS_EMULDIR_PWD}" != "${EMULDIR_PWD}"; then + if ${TEST} -e ${OPSYS_EMULDIR} -o -L ${OPSYS_EMULDIR}; then + ${CAT} << EOM ============================================================================== -You must create a symbolic link for ${PKGNAME} to work properly: +The following symbolic link must be created for ${PKGNAME} +to work properly: - $pkgemuldir -> $emuldir + ${EMULDIR} -> ${OPSYS_EMULDIR} -It seems there is something else located at $emuldir. ============================================================================== -EOF +EOM else - ${MKDIR} -p `${DIRNAME} $emuldir` && - ${LN} -fs $pkgemuldir $emuldir + ${ECHO} "${PKGNAME}: creating symlink ${EMULDIR} -> ${OPSYS_EMULDIR}" + ( ${MKDIR} -p `${DIRNAME} ${OPSYS_EMULDIR}` && + ${LN} -fs ${EMULDIR} ${OPSYS_EMULDIR} ) || ${TRUE} fi fi ;; + +REMOVE,0) + ${ECHO} "${PKGNAME}: removing ${EMULDIR}/dev" + ${RM} -fr ${EMULDIR}/dev + ${RM} -f ${ROOT_ACTIONS_COOKIE} + ;; + +ADD,*) + if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to complete +the installation of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} ADD + +============================================================================== +EOM + fi + ;; + +REMOVE,*) + if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to begin the +removal of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} REMOVE + +Then, please run pkg_delete(1) again to complete the removal of this +package. + +============================================================================== +EOM + exitcode=1 + fi + ;; +esac +exit $exitcode + +EOF + ${CHMOD} +x ./+ROOT_ACTIONS + ;; +esac + +EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@" +OPSYS_EMULDIR="@OPSYS_EMULDIR@" + +case "${STAGE}" in +POST-INSTALL) + # Create a /proc mount point. + ${MKDIR} -p ${EMULDIR}/proc + + # Make /etc/mtab usable for Linux programs. + ${RM} -f ${EMULDIR}/etc/mtab + ${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab + + # Run any actions that require root privileges. + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR} + ;; esac diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile index 2a6ee4703f2..aea3c7a1937 100644 --- a/emulators/suse100_base/Makefile +++ b/emulators/suse100_base/Makefile @@ -1,27 +1,18 @@ -# $NetBSD: Makefile,v 1.9 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2007/07/29 05:18:39 jlam Exp $ -DISTNAME= suse_base-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_base-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package -CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* +CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* -# these files are handled by manually during de-/installation/pkg_add -CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.* -CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache - -EXTRACT_ONLY= # empty -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q} \ - SUSE_COMPAT32_SUFFIX=${SUSE_COMPAT32_SUFFIX:Q} - -.include "../../mk/bsd.prefs.mk" +# These files are managed by the +INSTALL/+DEINSTALL scripts. +CHECK_FILES_SKIP+= ${EMULDIR}/dev/.* +CHECK_FILES_SKIP+= ${EMULDIR}/etc/ld.so.cache +CHECK_FILES_SKIP+= ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1 RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \ ./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \ @@ -30,53 +21,36 @@ RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \ ./etc/pam.d ./etc/profile ./etc/profile.dos \ ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype -LINUX_LDD= ${PREFIX}/${EMULSUBDIR}/usr/bin/ldd -LINUX_LIB?= lib +LINUX_LDD= ${EMULDIR}/usr/bin/ldd +LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig INSTALLATION_DIRS= sbin +OWN_DIRS+= ${EMULSUBDIR} + +SUBST_CLASSES+= suse +SUBST_STAGE.suse= do-build +SUBST_FILES.suse= SuSE-release linux-mkpwd.sh +SUBST_VARS.suse= EMULDIR SUSE_ARCH SUSE_VERSION -SUSE_INCLUDE_MAKEFILE_ARCH= yes +# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to +# the correct type. +# +BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}} -do-build: - @for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \ - ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \ - -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \ - -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \ - -e 's#@@VERSION@@#${SUSE_VERSION}#g' \ - -e 's#@@ARCH@@#${SUSE_ARCH}#g' \ - $$FILE >${WRKDIR}/`basename $$FILE`; \ - done +post-extract: + ${CP} ${FILESDIR}/SuSE-release ${WRKSRC} + ${CP} ${FILESDIR}/*.sh ${WRKSRC} do-install: - ${INSTALL_SCRIPT} ${FILESDIR}/linux-mkpwd.sh \ - ${PREFIX}/sbin/linux${SUSE_COMPAT32_SUFFIX}-mkpwd - ${INSTALL_DATA_DIR} ${EMULDIR}/dev - ${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev - if [ -f /dev/MAKEDEV.subr ]; then \ - ${INSTALL_DATA} /dev/MAKEDEV.subr ${EMULDIR}/dev; \ - fi - cd ${EMULDIR}/dev && ${SH} ./MAKEDEV std audio - cd ${EMULDIR}/dev && ${LN} -fs sound dsp - @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - ${RPM2PKG} ${RPM2PKGARGS} - ${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC} - ${INSTALL_DATA} ${WRKDIR}/SuSE-release ${EMULDIR}/etc - ${INSTALL_DATA_DIR} ${EMULDIR}/proc - ${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab -.if ${OPSYS} == "FreeBSD" - ${BRANDELF} -t Linux ${EMULDIR}/sbin/ldconfig -.endif - ${EMULDIR}/sbin/ldconfig -r ${EMULDIR} - ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \ - >>${PLIST_SRC} - ${ECHO} "@unexec ${RMDIR} %D/${EMULSUBDIR}/etc 2>/dev/null || ${TRUE}" \ - >>${PLIST_SRC} + ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \ + ${PREFIX}/sbin/${LINUX_BASE}-mkpwd + ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc + ${BRANDELF_CMD} ${SED} -e 's:#! :#! ${EMULDIR}:' \ -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \ - < ${LINUX_LDD} > ${LINUX_LDD}.new + ${LINUX_LDD} > ${LINUX_LDD}.new ${MV} ${LINUX_LDD}.new ${LINUX_LDD} ${CHMOD} +x ${LINUX_LDD} - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_base/Makefile.i386 b/emulators/suse100_base/Makefile.i386 deleted file mode 100644 index d5ab050b105..00000000000 --- a/emulators/suse100_base/Makefile.i386 +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= aaa_base-10.0-28.${SUSE_ARCH}.rpm \ - bash-3.0-17.${SUSE_ARCH}.rpm \ - coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \ - glibc-2.3.5-40.${SUSE_ARCH}.rpm \ - libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \ - libacl-2.2.31-3.${SUSE_ARCH}.rpm \ - libattr-2.4.24-2.${SUSE_ARCH}.rpm \ - libselinux-1.23.11-3.${SUSE_ARCH}.rpm \ - libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \ - ncurses-5.4-71.${SUSE_ARCH}.rpm \ - readline-5.0-9.${SUSE_ARCH}.rpm \ - zlib-1.2.3-3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_base/Makefile.powerpc b/emulators/suse100_base/Makefile.powerpc deleted file mode 100644 index 2d3601c5ae6..00000000000 --- a/emulators/suse100_base/Makefile.powerpc +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= aaa_base-10.0-28.${SUSE_ARCH}.rpm \ - bash-3.0-17.${SUSE_ARCH}.rpm \ - coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \ - glibc-2.3.5-40.${SUSE_ARCH}.rpm \ - libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \ - libacl-2.2.31-3.${SUSE_ARCH}.rpm \ - libattr-2.4.24-2.${SUSE_ARCH}.rpm \ - libselinux-1.23.11-3.${SUSE_ARCH}.rpm \ - libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \ - ncurses-5.4-71.${SUSE_ARCH}.rpm \ - readline-5.0-9.${SUSE_ARCH}.rpm \ - zlib-1.2.3-3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_base/Makefile.x86_64 b/emulators/suse100_base/Makefile.x86_64 deleted file mode 100644 index fd5652311d5..00000000000 --- a/emulators/suse100_base/Makefile.x86_64 +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= aaa_base-10.0-28.${SUSE_ARCH}.rpm \ - bash-3.0-17.${SUSE_ARCH}.rpm \ - coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \ - glibc-2.3.5-40.${SUSE_ARCH}.rpm \ - libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \ - libacl-2.2.31-3.${SUSE_ARCH}.rpm \ - libattr-2.4.24-2.${SUSE_ARCH}.rpm \ - libselinux-1.23.11-3.${SUSE_ARCH}.rpm \ - libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \ - ncurses-5.4-71.${SUSE_ARCH}.rpm \ - readline-5.0-9.${SUSE_ARCH}.rpm \ - zlib-1.2.3-3.${SUSE_ARCH}.rpm - -LINUX_LIB= lib64 diff --git a/emulators/suse100_base/PLIST b/emulators/suse100_base/PLIST index 7f94deb4cf5..d45388bb83f 100644 --- a/emulators/suse100_base/PLIST +++ b/emulators/suse100_base/PLIST @@ -1,15 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2007/04/19 15:30:20 xtraeme Exp $ -sbin/linux${SUSE_COMPAT32_SUFFIX}-mkpwd -@unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache -${EMULSUBDIR}/etc/SuSE-release -${EMULSUBDIR}/etc/mtab -${EMULSUBDIR}/usr/${LINUX_LIB}/libz.so.1 -@exec ${MKDIR} %D/${EMULSUBDIR}/proc -@dirrm ${EMULSUBDIR}/proc -@unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow -@exec ${MKDIR} %D/${EMULSUBDIR}/dev -@exec cp -p /dev/MAKEDEV %D/${EMULSUBDIR}/dev -@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio -@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp -@unexec ${RM} -f %D/${EMULSUBDIR}/dev/* -@dirrm ${EMULSUBDIR}/dev +@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:18:40 jlam Exp $ +sbin/${LINUX_BASE}-mkpwd +${EMULSUBDIRSLASH}etc/SuSE-release diff --git a/emulators/suse100_base/files/SuSE-release b/emulators/suse100_base/files/SuSE-release index 247032986b2..728e5a77870 100644 --- a/emulators/suse100_base/files/SuSE-release +++ b/emulators/suse100_base/files/SuSE-release @@ -1,2 +1,2 @@ -SuSE Linux @@VERSION@@ (@@ARCH@@) -VERSION = @@VERSION@@ +SuSE Linux @SUSE_VERSION@ (@SUSE_ARCH@) +VERSION = @SUSE_VERSION@ diff --git a/emulators/suse100_base/files/linux-mkpwd.sh b/emulators/suse100_base/files/linux-mkpwd.sh index d751a771b8d..24409a0fc7c 100644 --- a/emulators/suse100_base/files/linux-mkpwd.sh +++ b/emulators/suse100_base/files/linux-mkpwd.sh @@ -1,13 +1,31 @@ #!/bin/sh # -# $NetBSD: linux-mkpwd.sh,v 1.1.1.1 2006/03/09 20:34:10 tonio Exp $ +# $NetBSD: linux-mkpwd.sh,v 1.2 2007/07/29 05:18:40 jlam Exp $ +# + +###################################################################### +# +# NAME +# @LINUX_BASE@-mkpwd -- create passwd/group files for COMPAT_LINUX +# +# SYNOPSYS +# @LINUX_BASE@-mkpwd +# +# DESCRIPTION +# @LINUX_BASE@-mkpwd creates passwd and group files and databases +# for a COMPAT_LINUX installation based on the files found in +# /etc, e.g. /etc/passwd, /etc/master.passwd, /etc/group, etc. +# +###################################################################### SRCDIR=/etc -DESTDIR=@@EMULDIR@@/etc +DESTDIR=@EMULDIR@/etc + +[ -d $DESTDIR ] || exit 1 umask 22 cd $DESTDIR -cp $SRCDIR/passwd . +cp -f $SRCDIR/passwd . sed s/^wheel:/root:/ <$SRCDIR/group >group umask 77 diff --git a/emulators/suse100_base/suse.i386.mk b/emulators/suse100_base/suse.i386.mk new file mode 100644 index 00000000000..e666685287c --- /dev/null +++ b/emulators/suse100_base/suse.i386.mk @@ -0,0 +1,15 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:40 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES+= aaa_base-10.0-28.${SUSE_ARCH}.rpm +DISTFILES+= bash-3.0-17.${SUSE_ARCH}.rpm +DISTFILES+= coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm +DISTFILES+= glibc-2.3.5-40.${SUSE_ARCH}.rpm +DISTFILES+= libacl-2.2.31-3.${SUSE_ARCH}.rpm +DISTFILES+= libattr-2.4.24-2.${SUSE_ARCH}.rpm +DISTFILES+= libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm +DISTFILES+= libselinux-1.23.11-3.${SUSE_ARCH}.rpm +DISTFILES+= libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm +DISTFILES+= ncurses-5.4-71.${SUSE_ARCH}.rpm +DISTFILES+= readline-5.0-9.${SUSE_ARCH}.rpm +DISTFILES+= zlib-1.2.3-3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_base/suse.powerpc.mk b/emulators/suse100_base/suse.powerpc.mk new file mode 100644 index 00000000000..01000e50ded --- /dev/null +++ b/emulators/suse100_base/suse.powerpc.mk @@ -0,0 +1,15 @@ +# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:40 jlam Exp $ + +# SuSE PowerPC RPMs +DISTFILES+= aaa_base-10.0-28.${SUSE_ARCH}.rpm +DISTFILES+= bash-3.0-17.${SUSE_ARCH}.rpm +DISTFILES+= coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm +DISTFILES+= glibc-2.3.5-40.${SUSE_ARCH}.rpm +DISTFILES+= libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm +DISTFILES+= libacl-2.2.31-3.${SUSE_ARCH}.rpm +DISTFILES+= libattr-2.4.24-2.${SUSE_ARCH}.rpm +DISTFILES+= libselinux-1.23.11-3.${SUSE_ARCH}.rpm +DISTFILES+= libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm +DISTFILES+= ncurses-5.4-71.${SUSE_ARCH}.rpm +DISTFILES+= readline-5.0-9.${SUSE_ARCH}.rpm +DISTFILES+= zlib-1.2.3-3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_base/suse.x86_64.mk b/emulators/suse100_base/suse.x86_64.mk new file mode 100644 index 00000000000..b604c3c18ba --- /dev/null +++ b/emulators/suse100_base/suse.x86_64.mk @@ -0,0 +1,17 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:40 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES+= aaa_base-10.0-28.${SUSE_ARCH}.rpm +DISTFILES+= bash-3.0-17.${SUSE_ARCH}.rpm +DISTFILES+= coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm +DISTFILES+= glibc-2.3.5-40.${SUSE_ARCH}.rpm +DISTFILES+= libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm +DISTFILES+= libacl-2.2.31-3.${SUSE_ARCH}.rpm +DISTFILES+= libattr-2.4.24-2.${SUSE_ARCH}.rpm +DISTFILES+= libselinux-1.23.11-3.${SUSE_ARCH}.rpm +DISTFILES+= libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm +DISTFILES+= ncurses-5.4-71.${SUSE_ARCH}.rpm +DISTFILES+= readline-5.0-9.${SUSE_ARCH}.rpm +DISTFILES+= zlib-1.2.3-3.${SUSE_ARCH}.rpm + +LINUX_LIBSUBDIR= lib64 diff --git a/emulators/suse100_compat/DESCR b/emulators/suse100_compat/DESCR index addf8028f9b..573641b8dea 100644 --- a/emulators/suse100_compat/DESCR +++ b/emulators/suse100_compat/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 contains some old shared libraries required for backwards -compatibility. +This package contains some old shared libraries required by older +Linux binaries. diff --git a/emulators/suse100_compat/Makefile b/emulators/suse100_compat/Makefile index 3dfad8f1709..a3d823c074b 100644 --- a/emulators/suse100_compat/Makefile +++ b/emulators/suse100_compat/Makefile @@ -1,22 +1,16 @@ -# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:41 jlam Exp $ -DISTNAME= suse_compat-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_compat-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES+= compat-2004.11.13-4.${SUSE_ARCH}.rpm \ + compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \ + compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package with old shared libraries +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package with old shared libraries -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_compat/Makefile.i386 b/emulators/suse100_compat/Makefile.i386 deleted file mode 100644 index c3a16b181c2..00000000000 --- a/emulators/suse100_compat/Makefile.i386 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2007/03/24 21:52:04 salo Exp $ - -RPMFILES= compat-2004.11.13-4.${SUSE_ARCH}.rpm \ - compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \ - compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_compat/Makefile.powerpc b/emulators/suse100_compat/Makefile.powerpc deleted file mode 100644 index a019c0b044a..00000000000 --- a/emulators/suse100_compat/Makefile.powerpc +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2007/03/24 21:52:04 salo Exp $ - -RPMFILES= compat-2004.11.13-4.${SUSE_ARCH}.rpm \ - compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \ - compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_compat/Makefile.x86_64 b/emulators/suse100_compat/Makefile.x86_64 deleted file mode 100644 index 5deeb193a3d..00000000000 --- a/emulators/suse100_compat/Makefile.x86_64 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2007/03/24 21:52:04 salo Exp $ - -RPMFILES= compat-2004.11.13-4.${SUSE_ARCH}.rpm \ - compat-g77-3.3.5-2.${SUSE_ARCH}.rpm \ - compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_expat/DESCR b/emulators/suse100_expat/DESCR index 9f2f36c8801..4a64e91260e 100644 --- a/emulators/suse100_expat/DESCR +++ b/emulators/suse100_expat/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 -expat shared libraries. +This package supports running ELF binaries linked with glibc2 that +require expat shared libraries. diff --git a/emulators/suse100_expat/Makefile b/emulators/suse100_expat/Makefile index 0a2d158c24e..fd2fe645f48 100644 --- a/emulators/suse100_expat/Makefile +++ b/emulators/suse100_expat/Makefile @@ -1,23 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:41 jlam Exp $ -DISTNAME= suse_expat-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_expat-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators +DISTFILES= expat-1.95.8-5.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for expat binaries +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for expat -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -LIBTOOLIZE_PLIST= NO -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_expat/Makefile.i386 b/emulators/suse100_expat/Makefile.i386 deleted file mode 100644 index ccb141d14e5..00000000000 --- a/emulators/suse100_expat/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $ - -RPMFILES= expat-1.95.8-5.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_expat/Makefile.powerpc b/emulators/suse100_expat/Makefile.powerpc deleted file mode 100644 index 0038cf086b6..00000000000 --- a/emulators/suse100_expat/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $ - -RPMFILES= expat-1.95.8-5.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_expat/Makefile.x86_64 b/emulators/suse100_expat/Makefile.x86_64 deleted file mode 100644 index e852bacc46e..00000000000 --- a/emulators/suse100_expat/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $ - -RPMFILES= expat-1.95.8-5.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_fontconfig/DESCR b/emulators/suse100_fontconfig/DESCR index fffa11f3d2e..48a1e2cd2ab 100644 --- a/emulators/suse100_fontconfig/DESCR +++ b/emulators/suse100_fontconfig/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 -fontconfig shared libraries. +This package supports running ELF binaries linked with glibc2 that +require fontconfig shared libraries. diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile index 61b4cd6269b..a631f735a3a 100644 --- a/emulators/suse100_fontconfig/Makefile +++ b/emulators/suse100_fontconfig/Makefile @@ -1,23 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/29 05:18:42 jlam Exp $ -DISTNAME= suse_fontconfig-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_fontconfig-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for fontconfig binaries +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for fontconfig -DEPENDS+= suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse100_expat -DEPENDS+= suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= expat freetype2 .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_fontconfig/Makefile.i386 b/emulators/suse100_fontconfig/Makefile.i386 deleted file mode 100644 index 119ba720d93..00000000000 --- a/emulators/suse100_fontconfig/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_fontconfig/Makefile.powerpc b/emulators/suse100_fontconfig/Makefile.powerpc deleted file mode 100644 index b23c6d57fe3..00000000000 --- a/emulators/suse100_fontconfig/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_fontconfig/Makefile.x86_64 b/emulators/suse100_fontconfig/Makefile.x86_64 deleted file mode 100644 index dc81f87695d..00000000000 --- a/emulators/suse100_fontconfig/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_freetype2/DESCR b/emulators/suse100_freetype2/DESCR index b54860cc766..9d1ced14b3a 100644 --- a/emulators/suse100_freetype2/DESCR +++ b/emulators/suse100_freetype2/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 freetype2 shared -libraries. +This package supports running ELF binaries linked with glibc2 that +require freetype2 shared libraries. diff --git a/emulators/suse100_freetype2/Makefile b/emulators/suse100_freetype2/Makefile index 0124e4f4ca8..6578f5ff837 100644 --- a/emulators/suse100_freetype2/Makefile +++ b/emulators/suse100_freetype2/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:43 jlam Exp $ -DISTNAME= suse_freetype2-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_freetype2-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators +DISTFILES= freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for FreeType2 library +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for freetype-2.x -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_freetype2/Makefile.i386 b/emulators/suse100_freetype2/Makefile.i386 deleted file mode 100644 index e2f44be9044..00000000000 --- a/emulators/suse100_freetype2/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.3 2006/08/02 14:26:13 salo Exp $ - -RPMFILES= freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_freetype2/Makefile.powerpc b/emulators/suse100_freetype2/Makefile.powerpc deleted file mode 100644 index 5b5d86939b2..00000000000 --- a/emulators/suse100_freetype2/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.3 2006/08/02 14:26:13 salo Exp $ - -RPMFILES= freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_freetype2/Makefile.x86_64 b/emulators/suse100_freetype2/Makefile.x86_64 deleted file mode 100644 index 1cfd6f98838..00000000000 --- a/emulators/suse100_freetype2/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.3 2006/08/02 14:26:13 salo Exp $ - -RPMFILES= freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gdk-pixbuf/DESCR b/emulators/suse100_gdk-pixbuf/DESCR index b898081b301..dc8cea9566b 100644 --- a/emulators/suse100_gdk-pixbuf/DESCR +++ b/emulators/suse100_gdk-pixbuf/DESCR @@ -1,4 +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 that use gdk-pixbuf shared libraries. +This package supports running ELF binaries linked with glibc2 that +require gdk-pixbuf shared libraries. diff --git a/emulators/suse100_gdk-pixbuf/Makefile b/emulators/suse100_gdk-pixbuf/Makefile index dbcd44b5a7d..7da8eb25961 100644 --- a/emulators/suse100_gdk-pixbuf/Makefile +++ b/emulators/suse100_gdk-pixbuf/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:44 jlam Exp $ -DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for gdk-pixbuf binaries +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for gdk-pixbuf -DEPENDS+= suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse100_gtk - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= gtk .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_gdk-pixbuf/Makefile.i386 b/emulators/suse100_gdk-pixbuf/Makefile.i386 deleted file mode 100644 index 25d8922a5ff..00000000000 --- a/emulators/suse100_gdk-pixbuf/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gdk-pixbuf/Makefile.powerpc b/emulators/suse100_gdk-pixbuf/Makefile.powerpc deleted file mode 100644 index 6d03f7a23af..00000000000 --- a/emulators/suse100_gdk-pixbuf/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gdk-pixbuf/Makefile.x86_64 b/emulators/suse100_gdk-pixbuf/Makefile.x86_64 deleted file mode 100644 index 1c5b5906a36..00000000000 --- a/emulators/suse100_gdk-pixbuf/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_glx/DESCR b/emulators/suse100_glx/DESCR index 64e8143cf19..15d0f9e4737 100644 --- a/emulators/suse100_glx/DESCR +++ b/emulators/suse100_glx/DESCR @@ -1,4 +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 which require GL shared libraries. +This package supports running ELF binaries linked with glibc2 that +require OpenGL/Mesa shared libraries. diff --git a/emulators/suse100_glx/Makefile b/emulators/suse100_glx/Makefile index 9d3b39044e8..0853af4dbcd 100644 --- a/emulators/suse100_glx/Makefile +++ b/emulators/suse100_glx/Makefile @@ -1,23 +1,16 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:45 jlam Exp $ -DISTNAME= suse_glx-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_glx-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the GL library +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for OpenGL/Mesa -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11 +EMUL_MODULES.linux= x11 -EXTRACT_ONLY= # empty -NO_BUILD= YES -LIBTOOLIZE_PLIST= NO -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +# This symlink is managed by ldconfig(8). +CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libglide.so.3 .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_glx/Makefile.i386 b/emulators/suse100_glx/Makefile.i386 deleted file mode 100644 index 4dbf9e56d05..00000000000 --- a/emulators/suse100_glx/Makefile.i386 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $ - -# the -devel version is necessary for libGL.so et.al. symlinks only -RPMFILES= xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \ - xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_glx/Makefile.powerpc b/emulators/suse100_glx/Makefile.powerpc deleted file mode 100644 index 67d465aaae1..00000000000 --- a/emulators/suse100_glx/Makefile.powerpc +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $ - -# the -devel version is necessary for libGL.so et.al. symlinks only -RPMFILES= xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \ - xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_glx/Makefile.x86_64 b/emulators/suse100_glx/Makefile.x86_64 deleted file mode 100644 index 06d303bec4b..00000000000 --- a/emulators/suse100_glx/Makefile.x86_64 +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $ - -# the -devel version is necessary for libGL.so et.al. symlinks only -RPMFILES= xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \ - xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm \ - xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm \ - xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_glx/PLIST_rpmfix.i386 b/emulators/suse100_glx/PLIST_rpmfix.i386 deleted file mode 100644 index 84378627263..00000000000 --- a/emulators/suse100_glx/PLIST_rpmfix.i386 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $ -/usr/lib/libglide3.so.3 diff --git a/emulators/suse100_glx/suse.i386.mk b/emulators/suse100_glx/suse.i386.mk new file mode 100644 index 00000000000..f95fc83424e --- /dev/null +++ b/emulators/suse100_glx/suse.i386.mk @@ -0,0 +1,7 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $ + +# SuSE i386 RPMs; the -devel version is necessary for libGL.so et.al. +# symlinks only. +# +DISTFILES+= xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm +DISTFILES+= xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_glx/suse.powerpc.mk b/emulators/suse100_glx/suse.powerpc.mk new file mode 100644 index 00000000000..b3d95cb6282 --- /dev/null +++ b/emulators/suse100_glx/suse.powerpc.mk @@ -0,0 +1,7 @@ +# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $ + +# SuSE PowerPC RPMs; the -devel version is necessary for libGL.so et.al. +# symlinks only. +# +DISTFILES+= xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm +DISTFILES+= xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_glx/suse.x86_64.mk b/emulators/suse100_glx/suse.x86_64.mk new file mode 100644 index 00000000000..cfa6ad1584f --- /dev/null +++ b/emulators/suse100_glx/suse.x86_64.mk @@ -0,0 +1,9 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $ + +# SuSE x86_64 RPMs; the -devel version is necessary for libGL.so et.al. +# symlinks only. +# +DISTFILES+= xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm +DISTFILES+= xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm +DISTFILES+= xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm +DISTFILES+= xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gtk/DESCR b/emulators/suse100_gtk/DESCR index d404f886f92..91db428d711 100644 --- a/emulators/suse100_gtk/DESCR +++ b/emulators/suse100_gtk/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 -GTK shared libraries. +This package supports running ELF binaries linked with glibc2 that +require GTK+-1.x shared libraries. diff --git a/emulators/suse100_gtk/Makefile b/emulators/suse100_gtk/Makefile index d5bf3da247b..12bbd45624c 100644 --- a/emulators/suse100_gtk/Makefile +++ b/emulators/suse100_gtk/Makefile @@ -1,22 +1,15 @@ -# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:47 jlam Exp $ -DISTNAME= suse_gtk-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_gtk-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators +DISTFILES= glib-1.2.10-595.${SUSE_ARCH}.rpm \ + gtk-1.2.10-888.${SUSE_ARCH}.rpm -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for GTK binaries +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package for GTK+-1.x -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= x11 .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_gtk/Makefile.i386 b/emulators/suse100_gtk/Makefile.i386 deleted file mode 100644 index 1916b3414d5..00000000000 --- a/emulators/suse100_gtk/Makefile.i386 +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.2 2006/04/18 13:58:47 tron Exp $ - -RPMFILES= glib-1.2.10-595.${SUSE_ARCH}.rpm \ - gtk-1.2.10-888.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gtk/Makefile.powerpc b/emulators/suse100_gtk/Makefile.powerpc deleted file mode 100644 index c3d4ca5f0e9..00000000000 --- a/emulators/suse100_gtk/Makefile.powerpc +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 13:49:58 salo Exp $ - -RPMFILES= glib-1.2.10-595.${SUSE_ARCH}.rpm \ - gtk-1.2.10-888.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gtk/Makefile.x86_64 b/emulators/suse100_gtk/Makefile.x86_64 deleted file mode 100644 index 862f85e2557..00000000000 --- a/emulators/suse100_gtk/Makefile.x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 13:49:58 salo Exp $ - -RPMFILES= glib-1.2.10-595.${SUSE_ARCH}.rpm \ - gtk-1.2.10-888.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_gtk2/DEINSTALL b/emulators/suse100_gtk2/DEINSTALL new file mode 100644 index 00000000000..0c1759d2401 --- /dev/null +++ b/emulators/suse100_gtk2/DEINSTALL @@ -0,0 +1,15 @@ +# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:18:48 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/suse100_gtk2/DESCR b/emulators/suse100_gtk2/DESCR index 962f8891e8f..bc684571d53 100644 --- a/emulators/suse100_gtk2/DESCR +++ b/emulators/suse100_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/suse100_gtk2/INSTALL b/emulators/suse100_gtk2/INSTALL index ad34cc92f13..1336efe570f 100644 --- a/emulators/suse100_gtk2/INSTALL +++ b/emulators/suse100_gtk2/INSTALL @@ -1,15 +1,17 @@ -# $NetBSD: INSTALL,v 1.2 2007/02/18 12:34:19 tonio Exp $ +# $NetBSD: INSTALL,v 1.3 2007/07/29 05:18:48 jlam Exp $ # # Initialize gtk/pango module configuration. # case ${STAGE} in - POST-INSTALL) - @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0@BINSUFFIX@ > @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@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders + ${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration" + ${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules - @EMULDIR@/opt/gnome/bin/pango-querymodules@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/pango/pango.modules - ;; - *) + ${GNOME_BINDIR}/gdk-pixbuf-query-loaders@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders + + ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango.modules ;; esac diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile index 4406d208e1c..70f91b36917 100644 --- a/emulators/suse100_gtk2/Makefile +++ b/emulators/suse100_gtk2/Makefile @@ -1,32 +1,27 @@ -# $NetBSD: Makefile,v 1.8 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/29 05:18:48 jlam Exp $ -DISTNAME= suse_gtk2-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_gtk2-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators +DISTFILES= atk-1.10.3-2.${SUSE_ARCH}.rpm \ + glib2-2.8.1-3.${SUSE_ARCH}.rpm \ + gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \ + cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \ + glitz-0.4.4-4.${SUSE_ARCH}.rpm \ + pango-1.10.0-3.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for GTK2 binaries +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for GTK+-2.x -DEPENDS+= suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse100_fontconfig -DEPENDS+= suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2 -DEPENDS+= suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg -DEPENDS+= suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libpng -DEPENDS+= suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libtiff -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11 +EMUL_MODULES.linux= fontconfig freetype2 jpeg png tiff x11 -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +# These files are managed by the +INSTALL/+DEINSTALL scripts. +CHECK_FILES_SKIP+= ${EMULDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules +CHECK_FILES_SKIP+= ${EMULDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders +CHECK_FILES_SKIP+= ${EMULDIR}/etc/opt/gnome/pango/pango.modules -# Initialize gtk/pango modules. -FILES_SUBST+= EMULDIR=${EMULDIR:Q} -FILES_SUBST+= BINSUFFIX=${BINSUFFIX:Q} -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +BINSUFFIX?= # empty +FILES_SUBST+= BINSUFFIX=${BINSUFFIX:Q} .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_gtk2/Makefile.i386 b/emulators/suse100_gtk2/Makefile.i386 deleted file mode 100644 index c8ddfeb6c0f..00000000000 --- a/emulators/suse100_gtk2/Makefile.i386 +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.4 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= atk-1.10.3-2.${SUSE_ARCH}.rpm \ - glib2-2.8.1-3.${SUSE_ARCH}.rpm \ - gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \ - cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \ - glitz-0.4.4-4.${SUSE_ARCH}.rpm \ - pango-1.10.0-3.${SUSE_ARCH}.rpm - -BINSUFFIX= diff --git a/emulators/suse100_gtk2/Makefile.powerpc b/emulators/suse100_gtk2/Makefile.powerpc deleted file mode 100644 index 2200043a08b..00000000000 --- a/emulators/suse100_gtk2/Makefile.powerpc +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.4 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= atk-1.10.3-2.${SUSE_ARCH}.rpm \ - glib2-2.8.1-3.${SUSE_ARCH}.rpm \ - gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \ - cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \ - glitz-0.4.4-4.${SUSE_ARCH}.rpm \ - pango-1.10.0-3.${SUSE_ARCH}.rpm - -BINSUFFIX= diff --git a/emulators/suse100_gtk2/Makefile.x86_64 b/emulators/suse100_gtk2/Makefile.x86_64 deleted file mode 100644 index ada1129d2e6..00000000000 --- a/emulators/suse100_gtk2/Makefile.x86_64 +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.4 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= atk-1.10.3-2.${SUSE_ARCH}.rpm \ - glib2-2.8.1-3.${SUSE_ARCH}.rpm \ - gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \ - cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \ - glitz-0.4.4-4.${SUSE_ARCH}.rpm \ - pango-1.10.0-3.${SUSE_ARCH}.rpm - -BINSUFFIX= -64 diff --git a/emulators/suse100_gtk2/PLIST b/emulators/suse100_gtk2/PLIST deleted file mode 100644 index 72158d5fc79..00000000000 --- a/emulators/suse100_gtk2/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:38:51 tonio 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/suse100_gtk2/suse.x86_64.mk b/emulators/suse100_gtk2/suse.x86_64.mk new file mode 100644 index 00000000000..9f5b0ad0565 --- /dev/null +++ b/emulators/suse100_gtk2/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:49 jlam Exp $ + +# Suffix on the GTK+-2.x/Pango binaries used in the INSTALL script +BINSUFFIX= -64 diff --git a/emulators/suse100_libcups/DESCR b/emulators/suse100_libcups/DESCR index 63bc28d4eca..2ecf12ed3fb 100644 --- a/emulators/suse100_libcups/DESCR +++ b/emulators/suse100_libcups/DESCR @@ -1,4 +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 cups shared libraries. +This package supports running ELF binaries linked with glibc2 that +require CUPS shared libraries. diff --git a/emulators/suse100_libcups/Makefile b/emulators/suse100_libcups/Makefile index e21682eea09..5cbb4d2e68a 100644 --- a/emulators/suse100_libcups/Makefile +++ b/emulators/suse100_libcups/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:50 jlam Exp $ -DISTNAME= suse_libcups-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libcups-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm -MAINTAINER= markd@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the Cups library +MAINTAINER= markd@NetBSD.org +COMMENT= Linux compatibility package for CUPS -DEPENDS+= suse_openssl-${SUSE_VERSION}{,nb*}:../../emulators/suse100_openssl - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= openssl .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_libcups/Makefile.i386 b/emulators/suse100_libcups/Makefile.i386 deleted file mode 100644 index aefe14c0dd4..00000000000 --- a/emulators/suse100_libcups/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libcups/Makefile.powerpc b/emulators/suse100_libcups/Makefile.powerpc deleted file mode 100644 index 030a48e5e04..00000000000 --- a/emulators/suse100_libcups/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libcups/Makefile.x86_64 b/emulators/suse100_libcups/Makefile.x86_64 deleted file mode 100644 index 070a37b4647..00000000000 --- a/emulators/suse100_libcups/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= cups-libs-1.1.23-21.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libjpeg/DESCR b/emulators/suse100_libjpeg/DESCR index 3fe7a54d422..b9297dc4d48 100644 --- a/emulators/suse100_libjpeg/DESCR +++ b/emulators/suse100_libjpeg/DESCR @@ -1,4 +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 jpeg shared libraries. +This package supports running ELF binaries linked with glibc2 that +require JPEG shared libraries. diff --git a/emulators/suse100_libjpeg/Makefile b/emulators/suse100_libjpeg/Makefile index 4e0a265d59f..473496957f3 100644 --- a/emulators/suse100_libjpeg/Makefile +++ b/emulators/suse100_libjpeg/Makefile @@ -1,23 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:51 jlam Exp $ -DISTNAME= suse_libjpeg-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libjpeg-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators +DISTFILES= libjpeg-6.2.0-739.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the JPEG library +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for JPEG -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -LIBTOOLIZE_PLIST= NO -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_libjpeg/Makefile.i386 b/emulators/suse100_libjpeg/Makefile.i386 deleted file mode 100644 index 2e514eecb30..00000000000 --- a/emulators/suse100_libjpeg/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $ - -RPMFILES= libjpeg-6.2.0-739.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libjpeg/Makefile.powerpc b/emulators/suse100_libjpeg/Makefile.powerpc deleted file mode 100644 index e997f59f99e..00000000000 --- a/emulators/suse100_libjpeg/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $ - -RPMFILES= libjpeg-6.2.0-739.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libjpeg/Makefile.x86_64 b/emulators/suse100_libjpeg/Makefile.x86_64 deleted file mode 100644 index bffc9b5ac1a..00000000000 --- a/emulators/suse100_libjpeg/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $ - -RPMFILES= libjpeg-6.2.0-739.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libpng/DESCR b/emulators/suse100_libpng/DESCR index f330608b9fc..23bdd4b7227 100644 --- a/emulators/suse100_libpng/DESCR +++ b/emulators/suse100_libpng/DESCR @@ -1,4 +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 png shared libraries. +This package supports running ELF binaries linked with glibc2 that +require PNG shared libraries. diff --git a/emulators/suse100_libpng/Makefile b/emulators/suse100_libpng/Makefile index 9e7529b92ea..601b447dfd1 100644 --- a/emulators/suse100_libpng/Makefile +++ b/emulators/suse100_libpng/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/29 05:18:52 jlam Exp $ -DISTNAME= suse_libpng-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libpng-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= libpng-1.2.8-5.2.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the PNG library +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for PNG -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_libpng/Makefile.i386 b/emulators/suse100_libpng/Makefile.i386 deleted file mode 100644 index a1b3b6a771b..00000000000 --- a/emulators/suse100_libpng/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2006/12/06 10:35:58 wiz Exp $ - -RPMFILES= libpng-1.2.8-5.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libpng/Makefile.powerpc b/emulators/suse100_libpng/Makefile.powerpc deleted file mode 100644 index be131b36f60..00000000000 --- a/emulators/suse100_libpng/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2006/12/06 10:35:58 wiz Exp $ - -RPMFILES= libpng-1.2.8-5.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libpng/Makefile.x86_64 b/emulators/suse100_libpng/Makefile.x86_64 deleted file mode 100644 index b47853e883a..00000000000 --- a/emulators/suse100_libpng/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2006/12/06 10:35:58 wiz Exp $ - -RPMFILES= libpng-1.2.8-5.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libtiff/DESCR b/emulators/suse100_libtiff/DESCR index 6eb5ded69a7..8a6de414578 100644 --- a/emulators/suse100_libtiff/DESCR +++ b/emulators/suse100_libtiff/DESCR @@ -1,4 +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 tiff shared libraries. +This package supports running ELF binaries linked with glibc2 that +require TIFF shared libraries. diff --git a/emulators/suse100_libtiff/Makefile b/emulators/suse100_libtiff/Makefile index f7758f65ddd..c8ce6105945 100644 --- a/emulators/suse100_libtiff/Makefile +++ b/emulators/suse100_libtiff/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:52 jlam Exp $ -DISTNAME= suse_libtiff-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libtiff-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators +DISTFILES= libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the TIFF library +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for TIFF -DEPENDS+= suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= jpeg .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_libtiff/Makefile.i386 b/emulators/suse100_libtiff/Makefile.i386 deleted file mode 100644 index 31b6a755fc0..00000000000 --- a/emulators/suse100_libtiff/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.3 2006/08/02 14:26:13 salo Exp $ - -RPMFILES= libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libtiff/Makefile.powerpc b/emulators/suse100_libtiff/Makefile.powerpc deleted file mode 100644 index 1d19558fda9..00000000000 --- a/emulators/suse100_libtiff/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.3 2006/08/02 14:26:13 salo Exp $ - -RPMFILES= libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libtiff/Makefile.x86_64 b/emulators/suse100_libtiff/Makefile.x86_64 deleted file mode 100644 index abe1444fc35..00000000000 --- a/emulators/suse100_libtiff/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.3 2006/08/02 14:26:13 salo Exp $ - -RPMFILES= libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libxml2/DESCR b/emulators/suse100_libxml2/DESCR index 5748383626e..93549c57c7e 100644 --- a/emulators/suse100_libxml2/DESCR +++ b/emulators/suse100_libxml2/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 libxml2 shared -libraries. +This package supports running ELF binaries linked with glibc2 that +require libxml2 shared libraries. diff --git a/emulators/suse100_libxml2/Makefile b/emulators/suse100_libxml2/Makefile index 85a2cd7e8ba..7536fc791dc 100644 --- a/emulators/suse100_libxml2/Makefile +++ b/emulators/suse100_libxml2/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:53 jlam Exp $ DISTNAME= suse_libxml2-${SUSE_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTFILES= libxml2-2.6.20-4.${SUSE_ARCH}.rpm MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the libxml2 library +COMMENT= Linux compatibility package for libxml2 -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_libxml2/Makefile.i386 b/emulators/suse100_libxml2/Makefile.i386 deleted file mode 100644 index 8117679d2da..00000000000 --- a/emulators/suse100_libxml2/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $ - -RPMFILES= libxml2-2.6.20-4.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libxml2/Makefile.powerpc b/emulators/suse100_libxml2/Makefile.powerpc deleted file mode 100644 index d93a64cd8a5..00000000000 --- a/emulators/suse100_libxml2/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $ - -RPMFILES= libxml2-2.6.20-4.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_libxml2/Makefile.x86_64 b/emulators/suse100_libxml2/Makefile.x86_64 deleted file mode 100644 index 725a04f0822..00000000000 --- a/emulators/suse100_libxml2/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $ - -RPMFILES= libxml2-2.6.20-4.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common index bde7eaeb487..e2ebfb575dc 100644 --- a/emulators/suse100_linux/Makefile.common +++ b/emulators/suse100_linux/Makefile.common @@ -1,18 +1,32 @@ -# $NetBSD: Makefile.common,v 1.15 2007/05/04 23:46:56 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.16 2007/07/29 05:18:54 jlam Exp $ -.include "../../emulators/suse100_linux/vars.mk" -.include "../../emulators/suse100_linux/compat32.mk" -.include "../../emulators/suse100_linux/arch.mk" +SUSE_PKG= yes +SUSE_VERSION= 10.0 +SUSE_VERSION_REQD= ${SUSE_VERSION} -ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \ - NetBSD-[2-9]*-powerpc \ - NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \ - DragonFly-*-i386 +EMUL_PLATFORMS?= linux-i386 linux-powerpc linux-x86_64 + +.include "../../mk/bsd.prefs.mk" + +# The SuSE 10.x Linux packages are only usable on the following platforms. +ONLY_FOR_PLATFORM+= DragonFly-*-i386 +ONLY_FOR_PLATFORM+= FreeBSD-*-i386 +ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 +ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-powerpc +ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 + +# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures. +_SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH} +_SUSE_ARCH.i386= i586 +_SUSE_ARCH.powerpc= ppc +_SUSE_ARCH= ${_SUSE_ARCH.${EMUL_ARCH}} +SUSE_ARCH= ${_SUSE_ARCH} _SUSE_FTP_SUBDIR= distribution/SL-${SUSE_VERSION}-OSS/inst-source/suse/${SUSE_ARCH}/ -_SUSE_FTP_SUBDIR_UPD= suse/${SUSE_ARCH_DIR}/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ +_SUSE_FTP_SUBDIR_UPD= suse/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ -MASTER_SITE_SUSE100?= \ +MASTER_SITE_SUSE_${SUSE_VERSION}= \ ftp://suse.inode.at/opensuse/${_SUSE_FTP_SUBDIR} \ http://suse.inode.at/opensuse/${_SUSE_FTP_SUBDIR} \ ftp://suse.inode.at/pub/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ \ @@ -25,106 +39,35 @@ MASTER_SITE_SUSE100?= \ ftp://mirror.karneval.cz/pub/opensuse/${_SUSE_FTP_SUBDIR:S,distribution/,,} \ ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} -.ifndef SUSE_COMPAT32 +MASTER_SITES?= ${MASTER_SITE_SUSE_${SUSE_VERSION}} DIST_SUBDIR?= suse${SUSE_VERSION:S/.//}/${SUSE_ARCH} -.endif + +HOMEPAGE?= http://www.suse.com/ WRKSRC?= ${WRKDIR} +BUILD_DIRS?= # empty MANCOMPRESSED?= yes -# Don't check any script interpreter, as long as nobody complains. -CHECK_INTERPRETER_SKIP= * +EMUL_PKG_FMT?= rpm +RPM2PKG_PREFIX?= ${PREFIX} +RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} +RPM2PKG_STAGE?= do-install -OPSYS_EMULSUBDIR= linux${SUSE_COMPAT32_SUFFIX} -EMULSUBDIR= emul/linux${SUSE_COMPAT32_SUFFIX} -EMULDIR= ${PREFIX}/${EMULSUBDIR} - -# Set location of OPSYS-specific emulation directory -.if ${OPSYS} == "NetBSD" -. ifndef SUSE_COMPAT32 -OPSYS_EMULDIR= /${EMULSUBDIR} -. else -OPSYS_EMULDIR= ${EMULSUBDIR} -. endif -.elif (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly") -OPSYS_EMULDIR= /compat/${EMULSUBDIR:T} +.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") +PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} +COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} +LINUX_BASE= linux32 .else -OPSYS_EMULDIR= /${EMULSUBDIR} -.endif -FILES_SUBST+= OPSYS_EMULDIR=${OPSYS_EMULDIR:Q} \ - OPSYS_EMULSUBDIR=${OPSYS_EMULSUBDIR:Q} - -.ifdef SUSE_COMPAT32 -PLIST_SUBST+= ${FILES_SUBST} -.endif - -RPM2PKG= ${PREFIX}/sbin/rpm2pkg -BUILD_DEPENDS+= rpm2pkg>=2.1:../../pkgtools/rpm2pkg - -BUILD_DEFS+= RPMFILES -.if defined(RPMIGNOREPATH) -BUILD_DEFS+= RPMIGNOREPATH -.endif - -# The SuSE Linux packages have circular dependencies. -LDD?= ${TRUE} - -.ifndef SUSE_COMPAT32 -RPM2PKGSTRIP?= 1 -RPM2PKGARGS?= -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR} -. if empty(RPM2PKGSTRIP:M0) -RPM2PKGARGS+= -s ${RPM2PKGSTRIP} -. endif -. for TEMP in ${RPMIGNOREPATH} -RPM2PKGARGS+= -i ${TEMP} -. endfor -. for TEMP in ${RPMFILES} -RPM2PKGARGS+= ${DISTDIR}/${DIST_SUBDIR}/${TEMP} -. endfor +LINUX_BASE= linux .endif +PLIST_SUBST+= LINUX_BASE=${LINUX_BASE:Q} +FILES_SUBST+= LINUX_BASE=${LINUX_BASE:Q} -# regenerate distinfo for all platforms supported by the suse100_* packages -suse100-distinfo: - ( ${ECHO} '$$'NetBSD'$$'; \ - ${ECHO} ''; \ - MACHINE_ARCH=i386 ${MAKE} distinfo 1>&2; \ - ${GREP} rpm distinfo; \ - MACHINE_ARCH=powerpc ${MAKE} distinfo 1>&2; \ - ${GREP} rpm distinfo; \ - MACHINE_ARCH=x86_64 ${MAKE} distinfo 1>&2; \ - ${GREP} rpm distinfo; \ - ) > distinfo.new - ${MV} -f distinfo.new distinfo +LINUX_LIBSUBDIR?= lib +PLIST_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} +FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} -.ifdef SUSE_COMPAT32_SUFFIX -LOCAL_ARCH= i386 -.else -LOCAL_ARCH= ${MACHINE_ARCH} -.endif - -.if empty(${.CURDIR:Msuse100_base}) && !defined(SUSE_COMPAT32) -. if !target(do-install) -do-install: - @if [ -f ${PKGDIR}/PLIST ]; then \ - ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \ - else \ - ${RM} -f ${PLIST_SRC}; \ - ${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \ - fi - @if [ -f ${PKGDIR}/PLIST_rpmfix.${LOCAL_ARCH} ]; then \ - ${SED} -e 's,^/,${EMULSUBDIR}/,' \ - ${PKGDIR}/PLIST_rpmfix.${LOCAL_ARCH} >> ${PLIST_SRC}; \ - fi - ${RPM2PKG} ${RPM2PKGARGS} - @if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \ - ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \ - ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \ - ${MV} -f ${PLIST_SRC} ${PLIST_SRC}.old; \ - ${GREP} -v '^@dirrm' ${PLIST_SRC}.old >${PLIST_SRC} || ${TRUE}; \ - ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \ - ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \ - ${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \ - ${RM} -f ${PLIST_SRC}.old; \ - fi -. endif -.endif +# Include an "override" SuSE-specific and architecture-specific +# Makefile fragment if it exists. +# +.sinclude "suse.${EMUL_ARCH}.mk" diff --git a/emulators/suse100_linux/arch.mk b/emulators/suse100_linux/arch.mk deleted file mode 100644 index a81df844cef..00000000000 --- a/emulators/suse100_linux/arch.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: arch.mk,v 1.1.1.1 2006/03/09 20:33:46 tonio Exp $ - -.ifndef SUSE_ARCH_MK -SUSE_ARCH_MK=1 - -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" -SUSE_ARCH?= i586 -SUSE_ARCH_DIR?= ${MACHINE_ARCH} -.elif ${MACHINE_ARCH} == "powerpc" -SUSE_ARCH?= ppc -.else -SUSE_ARCH?= ${MACHINE_ARCH} -.endif - -SUSE_ARCH_DIR?= ${SUSE_ARCH} - -.endif # SUSE_ARCH_MK diff --git a/emulators/suse100_linux/compat32.mk b/emulators/suse100_linux/compat32.mk deleted file mode 100644 index 4349b0ef361..00000000000 --- a/emulators/suse100_linux/compat32.mk +++ /dev/null @@ -1,81 +0,0 @@ -# $NetBSD: compat32.mk,v 1.4 2007/04/20 21:35:00 xtraeme Exp $ -# - -.ifndef SUSE_LINUX_COMPAT32_MK -SUSE_LINUX_COMPAT32_MK= # defined - -.include "../../mk/bsd.prefs.mk" - -. if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64" - -# -# We must protect this part with packages that are using -# the options framework, otherwise we'll end executing two -# targets for the options. -# -. ifndef SUSE_COMPAT32_OPT -PKG_OPTIONS_VAR= PKG_OPTIONS.suse -PKG_SUPPORTED_OPTIONS= compat32 - -. include "../../mk/bsd.options.mk" -. else -ONLY_FOR_PLATFORM:= ${ONLY_FOR_PLATFORM} NetBSD-*-x86_64 -#MACHINE_ARCH:= i386 -DEPENDS:= ${DEPENDS:S/suse/suse32/} -EMULSUBDIR:= emul/linux32 -. endif - -STRING_ERROR1= \ - "This package is not compatible with x86_64 without using " -STRING_ERROR2= \ - "PKG_OPTIONS.suse=compat32." -MYSTRING= ${STRING_ERROR1}${STRING_ERROR2} - -. if !empty(PKG_OPTIONS:Mcompat32) -# -# We don't need to override the following vars in packages using -# SUSE_COMPAT32, because this is only required for the suse -# packages. -# -. ifndef SUSE_COMPAT32 -# -# Override required vars -# -PKGNAME:= ${DISTNAME:S/suse/suse32/} -COMMENT:= ${COMMENT:S/Linux/Linux 32/} -SUSE_ARCH:= i586 -. endif -# -# This is common for all linux packages. -# -MACHINE_ARCH:= i386 -ARCH:= ${MACHINE_ARCH} -DEPENDS:= ${DEPENDS:S/suse/suse32/} -LINUX_LIB:= lib -BINSUFFIX:= # empty -# -# Use the correct directories. -# -OPSYS_EMULSUBDIR= linux32 -SUSE_COMPAT32_SUFFIX= 32 -EMULSUBDIR:= emul/linux32 -. else -OPSYS_EMULSUBDIR= linux -SUSE_COMPAT32_SUFFIX= # empty -. if defined(ONLY_FOR_PLATFORM) && \ - empty(ONLY_FOR_PLATFORM:MNetBSD-*-x86_64) -PKG_FAIL_REASON+= ${MYSTRING} -. endif -. endif # end of PKG_OPTIONS.suse=compat32 -. endif # end of NetBSD && x86_64 -# -# This is to avoid to use the same code on every package -# many times. -# -. ifdef SUSE_INCLUDE_MAKEFILE_ARCH -. if exists(Makefile.${MACHINE_ARCH}) -. include "Makefile.${MACHINE_ARCH}" -. endif -. endif - -.endif # end of SUSE_LINUX_COMPAT32_MK diff --git a/emulators/suse100_linux/emulator.mk b/emulators/suse100_linux/emulator.mk new file mode 100644 index 00000000000..3b022e062ce --- /dev/null +++ b/emulators/suse100_linux/emulator.mk @@ -0,0 +1,50 @@ +# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:18:55 jlam Exp $ +# +# This file is included by linux-suse.mk in the emulator framework. +# +# Variables set by this file: +# +# EMUL_DISTRO +# The SuSE Linux distribution. +# +# DEPENDS_${EMUL_DISTRO}.* +# A table that maps "modules" to SuSE package dependencies. +# + +EMUL_DISTRO= suse-10.0 + +.if defined(SUSE_PKG) +_SUSE_VERSION_REQD= -${SUSE_VERSION_REQD}{,nb*} +.else +_SUSE_VERSION_REQD= >=${SUSE_VERSION_REQD} +.endif + +# DEPENDS_suse-10.0.* maps Linux "modules" to SuSE package dependencies. +DEPENDS_suse-10.0.aspell?= suse_aspell${_SUSE_VERSION_REQD}:../../emulators/suse100_aspell +DEPENDS_suse-10.0.base?= suse_base${_SUSE_VERSION_REQD}:../../emulators/suse100_base +DEPENDS_suse-10.0.compat?= suse_compat${_SUSE_VERSION_REQD}:../../emulators/suse100_compat +DEPENDS_suse-10.0.cups?= suse_libcups${_SUSE_VERSION_REQD}:../../emulators/suse100_libcups +DEPENDS_suse-10.0.expat?= suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse100_expat +DEPENDS_suse-10.0.fontconfig?= suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse100_fontconfig +DEPENDS_suse-10.0.freetype2?= suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse100_freetype2 +DEPENDS_suse-10.0.gdk-pixbuf?= suse_gdk-pixbuf${_SUSE_VERSION_REQD}:../../emulators/suse100_gdk-pixbuf +DEPENDS_suse-10.0.glx?= suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse100_glx +DEPENDS_suse-10.0.gtk?= suse_gtk${_SUSE_VERSION_REQD}:../../emulators/suse100_gtk +DEPENDS_suse-10.0.gtk2?= suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse100_gtk2 +DEPENDS_suse-10.0.jpeg?= suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse100_libjpeg +DEPENDS_suse-10.0.locale?= suse_locale${_SUSE_VERSION_REQD}:../../emulators/suse100_locale +DEPENDS_suse-10.0.motif?= suse_openmotif${_SUSE_VERSION_REQD}:../../emulators/suse100_openmotif +DEPENDS_suse-10.0.openssl?= suse_openssl${_SUSE_VERSION_REQD}:../../emulators/suse100_openssl +DEPENDS_suse-10.0.png?= suse_libpng${_SUSE_VERSION_REQD}:../../emulators/suse100_libpng +DEPENDS_suse-10.0.slang?= suse_slang${_SUSE_VERSION_REQD}:../../emulators/suse100_slang +DEPENDS_suse-10.0.tiff?= suse_libtiff${_SUSE_VERSION_REQD}:../../emulators/suse100_libtiff +DEPENDS_suse-10.0.vmware?= suse_vmware${_SUSE_VERSION_REQD}:../../emulators/suse100_vmware +DEPENDS_suse-10.0.x11?= suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse100_x11 +DEPENDS_suse-10.0.xml2?= suse_libxml2${_SUSE_VERSION_REQD}:../../emulators/suse100_libxml2 + +.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") +. for _mod_ in ${_LINUX_MODULES} +DEPENDS_suse-10.0.${_mod_}:= \ + ${DEPENDS_suse-10.0.${_mod_}:S/^suse_/suse32_/} +. endfor +.endif diff --git a/emulators/suse100_linux/vars.mk b/emulators/suse100_linux/vars.mk deleted file mode 100644 index 7f78258bdaf..00000000000 --- a/emulators/suse100_linux/vars.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: vars.mk,v 1.1.1.1 2006/03/09 20:33:46 tonio Exp $ - -.ifndef SUSE_VARS_MK -SUSE_VARS_MK=1 - -SUSE_DIR_PREFIX= suse100 -SUSE_VERSION= 10.0 - -.endif # SUSE_VARS_MK diff --git a/emulators/suse100_locale/DESCR b/emulators/suse100_locale/DESCR index 25484919ed3..f5796d1ef9e 100644 --- a/emulators/suse100_locale/DESCR +++ b/emulators/suse100_locale/DESCR @@ -1,4 +1,5 @@ -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 includes the glibc locale files. +This package contains the glibc2 locale files. diff --git a/emulators/suse100_locale/Makefile b/emulators/suse100_locale/Makefile index 71a4a30e311..6c1db2fe4ec 100644 --- a/emulators/suse100_locale/Makefile +++ b/emulators/suse100_locale/Makefile @@ -1,24 +1,16 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:55 jlam Exp $ -DISTNAME= suse_locale-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_locale-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators +DISTFILES= glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Locale files for the Linux compatibility package +CONFLICTS= linux-locale-[0-9]* -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package with locale files -CONFLICTS= linux-locale-[0-9]* - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_locale/Makefile.i386 b/emulators/suse100_locale/Makefile.i386 deleted file mode 100644 index 90b6fccd962..00000000000 --- a/emulators/suse100_locale/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $ - -RPMFILES= glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_locale/Makefile.powerpc b/emulators/suse100_locale/Makefile.powerpc deleted file mode 100644 index 6355c572d00..00000000000 --- a/emulators/suse100_locale/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $ - -RPMFILES= glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_locale/Makefile.x86_64 b/emulators/suse100_locale/Makefile.x86_64 deleted file mode 100644 index 270741ff188..00000000000 --- a/emulators/suse100_locale/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $ - -RPMFILES= glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openmotif/DESCR b/emulators/suse100_openmotif/DESCR index f67dbf54135..a24d084b127 100644 --- a/emulators/suse100_openmotif/DESCR +++ b/emulators/suse100_openmotif/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 OpenMotif shared -libraries. +This package supports running ELF binaries linked with glibc2 that +require OpenMotif shared libraries. diff --git a/emulators/suse100_openmotif/Makefile b/emulators/suse100_openmotif/Makefile index 74adf372e2c..8c45280b4fc 100644 --- a/emulators/suse100_openmotif/Makefile +++ b/emulators/suse100_openmotif/Makefile @@ -1,22 +1,13 @@ -# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/07/29 05:18:56 jlam Exp $ -DISTNAME= suse_openmotif-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_openmotif-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the Motif library +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package for OpenMotif -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= x11 .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_openmotif/Makefile.i386 b/emulators/suse100_openmotif/Makefile.i386 deleted file mode 100644 index 878ef2f0470..00000000000 --- a/emulators/suse100_openmotif/Makefile.i386 +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 09:01:36 tron Exp $ - -RPMFILES= openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm \ - openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openmotif/Makefile.powerpc b/emulators/suse100_openmotif/Makefile.powerpc deleted file mode 100644 index 63b92bcbceb..00000000000 --- a/emulators/suse100_openmotif/Makefile.powerpc +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1 2006/04/18 09:29:47 salo Exp $ - -RPMFILES= openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm \ - openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openmotif/Makefile.x86_64 b/emulators/suse100_openmotif/Makefile.x86_64 deleted file mode 100644 index 7829ea9b7ad..00000000000 --- a/emulators/suse100_openmotif/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/04/18 09:29:47 salo Exp $ - -RPMFILES= openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openmotif/suse.i386.mk b/emulators/suse100_openmotif/suse.i386.mk new file mode 100644 index 00000000000..3a7e5db26f8 --- /dev/null +++ b/emulators/suse100_openmotif/suse.i386.mk @@ -0,0 +1,5 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:57 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES+= openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm +DISTFILES+= openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openmotif/suse.powerpc.mk b/emulators/suse100_openmotif/suse.powerpc.mk new file mode 100644 index 00000000000..0365bd54936 --- /dev/null +++ b/emulators/suse100_openmotif/suse.powerpc.mk @@ -0,0 +1,5 @@ +# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:57 jlam Exp $ + +# SuSE PowerPC RPMs +DISTFILES+= openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm +DISTFILES+= openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openmotif/suse.x86_64.mk b/emulators/suse100_openmotif/suse.x86_64.mk new file mode 100644 index 00000000000..e31e61ac061 --- /dev/null +++ b/emulators/suse100_openmotif/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:57 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES= openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openssl/DESCR b/emulators/suse100_openssl/DESCR index 2f0601735d1..13eec82d7d4 100644 --- a/emulators/suse100_openssl/DESCR +++ b/emulators/suse100_openssl/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 openssl shared -libraries. +This package supports running ELF binaries linked with glibc2 that +require OpenSSL shared libraries. diff --git a/emulators/suse100_openssl/Makefile b/emulators/suse100_openssl/Makefile index 45781473145..4ebfe67a5db 100644 --- a/emulators/suse100_openssl/Makefile +++ b/emulators/suse100_openssl/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/29 05:18:57 jlam Exp $ -DISTNAME= suse_openssl-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_openssl-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators +DISTFILES= openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm -MAINTAINER= markd@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the OpenSSL library +MAINTAINER= markd@NetBSD.org +COMMENT= Linux compatibility package for OpenSSL -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_openssl/Makefile.i386 b/emulators/suse100_openssl/Makefile.i386 deleted file mode 100644 index e5d18b28c72..00000000000 --- a/emulators/suse100_openssl/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.3 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openssl/Makefile.powerpc b/emulators/suse100_openssl/Makefile.powerpc deleted file mode 100644 index fe5dfc4df9e..00000000000 --- a/emulators/suse100_openssl/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.3 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_openssl/Makefile.x86_64 b/emulators/suse100_openssl/Makefile.x86_64 deleted file mode 100644 index c0e4c4c2b0d..00000000000 --- a/emulators/suse100_openssl/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.3 2007/03/24 21:52:51 salo Exp $ - -RPMFILES= openssl-0.9.7g-2.12.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_slang/DESCR b/emulators/suse100_slang/DESCR index f9f21396127..f870b1b9b9f 100644 --- a/emulators/suse100_slang/DESCR +++ b/emulators/suse100_slang/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 -the "slang" library. +This package supports running ELF binaries linked with glibc2 that +require S-Lang shared libraries. diff --git a/emulators/suse100_slang/Makefile b/emulators/suse100_slang/Makefile index 5b48a342908..c0311a3a591 100644 --- a/emulators/suse100_slang/Makefile +++ b/emulators/suse100_slang/Makefile @@ -1,27 +1,20 @@ -# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:58 jlam Exp $ -DISTNAME= suse_slang-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_slang-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= slang-1.4.9-127.${SUSE_ARCH}.rpm -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for slang library +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for S-Lang -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base +EMUL_MODULES.linux= base -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +# This symlink is managed by ldconfig(8). +CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1 post-install: - cd ${PREFIX}/${EMULSUBDIR}/usr/lib && \ - ${LN} -sf libslang-utf8.so.1 libslang.so.1 + cd ${EMULDIR}/usr/lib && ${LN} -fs libslang-utf8.so.1 libslang.so.1 .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_slang/Makefile.i386 b/emulators/suse100_slang/Makefile.i386 deleted file mode 100644 index 919a4929a5c..00000000000 --- a/emulators/suse100_slang/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $ - -RPMFILES= slang-1.4.9-127.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_slang/Makefile.powerpc b/emulators/suse100_slang/Makefile.powerpc deleted file mode 100644 index ad5d557c2f3..00000000000 --- a/emulators/suse100_slang/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $ - -RPMFILES= slang-1.4.9-127.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_slang/Makefile.x86_64 b/emulators/suse100_slang/Makefile.x86_64 deleted file mode 100644 index 448940cc2e0..00000000000 --- a/emulators/suse100_slang/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $ - -RPMFILES= slang-1.4.9-127.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_slang/PLIST b/emulators/suse100_slang/PLIST deleted file mode 100644 index 4451b4a5386..00000000000 --- a/emulators/suse100_slang/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2006/06/30 16:20:24 salo Exp $ -@exec ${LN} -sf %D/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 %D/${EMULSUBDIR}/usr/lib/libslang.so.1 diff --git a/emulators/suse100_slang/PLIST_rpmfix.i386 b/emulators/suse100_slang/PLIST_rpmfix.i386 deleted file mode 100644 index ba94212ba3d..00000000000 --- a/emulators/suse100_slang/PLIST_rpmfix.i386 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $ -/usr/lib/libslang.so.1 diff --git a/emulators/suse100_vmware/DEINSTALL b/emulators/suse100_vmware/DEINSTALL new file mode 100644 index 00000000000..eaf7327d1f8 --- /dev/null +++ b/emulators/suse100_vmware/DEINSTALL @@ -0,0 +1,9 @@ +# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:00 jlam Exp $ + +case "${STAGE}" in +DEINSTALL) + # Run any actions that require root privileges. + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1 + ;; +esac diff --git a/emulators/suse100_vmware/DESCR b/emulators/suse100_vmware/DESCR index 9777e703fdd..efff03682f1 100644 --- a/emulators/suse100_vmware/DESCR +++ b/emulators/suse100_vmware/DESCR @@ -1,4 +1,5 @@ -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 is supposed to help running VMware under NetBSD. +This package is a helper package for running VMware. diff --git a/emulators/suse100_vmware/INSTALL b/emulators/suse100_vmware/INSTALL new file mode 100644 index 00000000000..c1d5d28d67c --- /dev/null +++ b/emulators/suse100_vmware/INSTALL @@ -0,0 +1,156 @@ +# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:00 jlam Exp $ + +# Generate a +ROOT_ACTIONS script that runs certain actions that require +# superuser privileges. +# +case "${STAGE},$1" in +UNPACK,|UNPACK,+ROOT_ACTIONS) + ${CAT} > ./+ROOT_ACTIONS << 'EOF' +#!@SH@ +# +# +ROOT_ACTIONS - run actions requiring superuser privileges +# +# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir] +# +# This script runs certain actions that require superuser privileges. +# If such privileges are not available, then simply output a message +# asking the user to run this script with the appropriate elevated +# privileges. +# +# Lines starting with "# SYMLINK: " are data read by this script that +# name the source paths and corresponding symlink that is managed by +# this script. If the symlink path is relative, then it is taken to be +# relative to ${PKG_PREFIX}. The source path is always unchanged. +# +# # SYMLINK: /dev/rcd0a ${EMULSUBDIR}/dev/cdrom +# + +CAT="@CAT@" +CHMOD="@CHMOD@" +ECHO="@ECHO@" +ID="@ID@" +LN="@LN@" +PWD_CMD="@PWD_CMD@" +RM="@RM@" +SED="@SED@" +TEST="@TEST@" + +SELF=$0 +ACTION=$1 + +CURDIR=`${PWD_CMD}` +PKG_METADATA_DIR="${2-${CURDIR}}" +: ${PKGNAME=${PKG_METADATA_DIR##*/}} +: ${PKG_PREFIX=@PREFIX@} + +ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done" +EUID=`${ID} -u` + +exitcode=0 +case $ACTION,$EUID in +ADD,0) + ${ECHO} "" > ${ROOT_ACTIONS_COOKIE} + ${CHMOD} g+w ${ROOT_ACTIONS_COOKIE} + ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} | + while read src dst; do + case $src in + "") continue ;; + esac + case $dst in + "") continue ;; + [!/]*) dst="${PKG_PREFIX}/$dst" ;; + esac + + if ${TEST} ! -e "$dst"; then + ${ECHO} "${PKGNAME}: linking $dst -> $src" + ${LN} -fs "$src" "$dst" + fi + done + ;; + +REMOVE,0) + ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} | + while read src dst; do + case $src in + "") continue ;; + esac + case $dst in + "") continue ;; + [!/]*) dst="${PKG_PREFIX}/$dst" ;; + esac + + if ${TEST} -e "$dst"; then + ${ECHO} "${PKGNAME}: removing $dst" + ${RM} -f "$dst" + fi + done + ${RM} -f ${ROOT_ACTIONS_COOKIE} + ;; + +ADD,*) + if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to complete +the installation of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} ADD + +============================================================================== +EOM + fi + ;; + +REMOVE,*) + if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to begin the +removal of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} REMOVE + +Then, please run pkg_delete(1) again to complete the removal of this +package. + +============================================================================== +EOM + exitcode=1 + fi + ;; +esac +exit $exitcode + +EOF + ${SED} -n "/^\# SYMLINK: /p" ${SELF} >> ./+ROOT_ACTIONS + ${CHMOD} +x ./+ROOT_ACTIONS + ;; +esac + +# SYMLINK: /dev/rcd0a @EMULSUBDIR@/dev/cdrom +# SYMLINK: /dev/rfd0a @EMULSUBDIR@/dev/fd0 +# SYMLINK: /dev/wd0d @EMULSUBDIR@/dev/hda +# SYMLINK: /dev/wd1d @EMULSUBDIR@/dev/hdb +# SYMLINK: /dev/wd2d @EMULSUBDIR@/dev/hdc +# SYMLINK: /dev/wd3d @EMULSUBDIR@/dev/hdd +# SYMLINK: /dev/sd0d @EMULSUBDIR@/dev/hde +# SYMLINK: /dev/sd1d @EMULSUBDIR@/dev/hdf +# SYMLINK: /dev/sd2d @EMULSUBDIR@/dev/hdg +# SYMLINK: /dev/sd3d @EMULSUBDIR@/dev/hdh +# SYMLINK: /dev/sd4d @EMULSUBDIR@/dev/hdi +# SYMLINK: /dev/ttyE0 @EMULSUBDIR@/dev/tty1 +# SYMLINK: /dev/ttyE1 @EMULSUBDIR@/dev/tty2 +# SYMLINK: /dev/ttyE2 @EMULSUBDIR@/dev/tty3 +# SYMLINK: /dev/ttyE3 @EMULSUBDIR@/dev/tty4 +# SYMLINK: /dev/ttyE4 @EMULSUBDIR@/dev/tty5 +# SYMLINK: /dev/ttyE5 @EMULSUBDIR@/dev/tty6 +# SYMLINK: /dev/ttyE6 @EMULSUBDIR@/dev/tty7 +# SYMLINK: /dev/ttyE7 @EMULSUBDIR@/dev/tty8 +# SYMLINK: tty1 @EMULSUBDIR@/dev/tty0 + +case "${STAGE}" in +POST-INSTALL) + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR} + ;; +esac diff --git a/emulators/suse100_vmware/Makefile b/emulators/suse100_vmware/Makefile index bc8b623fd91..31e7ed9870a 100644 --- a/emulators/suse100_vmware/Makefile +++ b/emulators/suse100_vmware/Makefile @@ -1,35 +1,15 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/29 05:19:00 jlam Exp $ DISTNAME= suse_vmware-${SUSE_VERSION} +PKGREVISION= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTFILES= grep-2.5.1a-5.${SUSE_ARCH}.rpm MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package to support running VMware +COMMENT= Linux compatibility package to help run VMware -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} - -RPMFILES= grep-2.5.1a-5.i586.rpm -RPMIGNOREPATH= usr - -post-install: - ${GREP} -v '^#' ${FILESDIR}/device-links | \ - ${AWK} '{print("${LN} -fs "$$1" ${EMULDIR}/dev/"$$2)}' | \ - ${SH} - - ${GREP} -v '^#' ${FILESDIR}/device-links | \ - ${AWK} '{print("@exec ${LN} -fs "$$1" %D/${EMULSUBDIR}/dev/"$$2)}' \ - >>${PLIST_SRC} - ${GREP} -v '^#' ${FILESDIR}/device-links | \ - ${AWK} '{print("@unexec ${RM} -f %D/${EMULSUBDIR}/dev/"$$2)}' \ - >>${PLIST_SRC} +EMUL_MODULES.linux= base x11 +RPMIGNOREPATH= usr .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_vmware/PLIST b/emulators/suse100_vmware/PLIST deleted file mode 100644 index c2dda48050e..00000000000 --- a/emulators/suse100_vmware/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $ -@comment this plist intentionally left empty diff --git a/emulators/suse100_vmware/distinfo b/emulators/suse100_vmware/distinfo index 8c544fcff27..41dd56c3353 100644 --- a/emulators/suse100_vmware/distinfo +++ b/emulators/suse100_vmware/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $ +$NetBSD: distinfo,v 1.2 2007/07/29 05:19:01 jlam Exp $ SHA1 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 728aab187b21e2e3ca8157a04e6bfec289c0fe43 RMD160 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 884f721b66cf236d7baccf83711495ed67529e52 Size (suse100/i586/grep-2.5.1a-5.i586.rpm) = 179908 bytes +SHA1 (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = 8a73f4feb5c263c33899d4466545f083d888b6fd +RMD160 (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = a9da42c0b55eb8984a51c6b64f213ddb1e207537 +Size (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = 187765 bytes +SHA1 (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = 0727852e8e75fb8af48dc463882efe810e76378a +RMD160 (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = cfde4f3da0f7a1fb463f46ef5dbaa9ef0b2a949a +Size (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = 182763 bytes diff --git a/emulators/suse100_vmware/files/device-links b/emulators/suse100_vmware/files/device-links deleted file mode 100644 index fb13c5500f6..00000000000 --- a/emulators/suse100_vmware/files/device-links +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: device-links,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $ -/dev/rcd0a cdrom -/dev/rfd0a fd0 -/dev/wd0d hda -/dev/wd1d hdb -/dev/wd2d hdc -/dev/wd3d hdd -/dev/sd0d hde -/dev/sd1d hdf -/dev/sd2d hdg -/dev/sd3d hdh -/dev/sd4d hdi -/dev/ttyE0 tty1 -/dev/ttyE1 tty2 -/dev/ttyE2 tty3 -/dev/ttyE3 tty4 -/dev/ttyE4 tty5 -/dev/ttyE5 tty6 -/dev/ttyE6 tty7 -/dev/ttyE7 tty8 -tty1 tty0 diff --git a/emulators/suse100_x11/DESCR b/emulators/suse100_x11/DESCR index 023c56f39b1..9ce91f0841f 100644 --- a/emulators/suse100_x11/DESCR +++ b/emulators/suse100_x11/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 -X11 shared libraries. +This package supports running ELF binaries linked with glibc2 that +require X11 shared libraries. diff --git a/emulators/suse100_x11/Makefile b/emulators/suse100_x11/Makefile index 34ceee39817..ca29939f52d 100644 --- a/emulators/suse100_x11/Makefile +++ b/emulators/suse100_x11/Makefile @@ -1,22 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:01 jlam Exp $ -DISTNAME= suse_x11-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE100} -DISTFILES= ${RPMFILES} +DISTNAME= suse_x11-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for X11 binaries +MAINTAINER= tonio@NetBSD.org +COMMENT= Linux compatibility package for X11 -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -SUSE_INCLUDE_MAKEFILE_ARCH= yes +EMUL_MODULES.linux= base .include "../../emulators/suse100_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse100_x11/Makefile.i386 b/emulators/suse100_x11/Makefile.i386 deleted file mode 100644 index 1c9d6e474cc..00000000000 --- a/emulators/suse100_x11/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_x11/Makefile.powerpc b/emulators/suse100_x11/Makefile.powerpc deleted file mode 100644 index 00a4b715d3e..00000000000 --- a/emulators/suse100_x11/Makefile.powerpc +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse100_x11/Makefile.x86_64 b/emulators/suse100_x11/Makefile.x86_64 deleted file mode 100644 index 318058b0546..00000000000 --- a/emulators/suse100_x11/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $ - -RPMFILES= xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_aspell/DESCR b/emulators/suse91_aspell/DESCR index 62e5a3f87e9..824b179f770 100644 --- a/emulators/suse91_aspell/DESCR +++ b/emulators/suse91_aspell/DESCR @@ -1,5 +1,5 @@ -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 it. -This package supports running ELF binaries linked with glibc2 which don't -require X11 shared libraries. +This package supports running ELF binaries linked with glibc2 that +require aspell shared libraries. diff --git a/emulators/suse91_aspell/Makefile b/emulators/suse91_aspell/Makefile index 698f08429df..68fe745368f 100644 --- a/emulators/suse91_aspell/Makefile +++ b/emulators/suse91_aspell/Makefile @@ -1,24 +1,14 @@ -# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.11 2007/07/29 05:19:02 jlam Exp $ -DISTNAME= suse_aspell-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_aspell-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators +DISTFILES= aspell-0.50.5-38.4.${SUSE_ARCH}.rpm -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for Aspell library +MAINTAINER= jdolecek@NetBSD.org +COMMENT= Linux compatibility package for aspell -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_aspell/Makefile.i386 b/emulators/suse91_aspell/Makefile.i386 deleted file mode 100644 index b4dd2849563..00000000000 --- a/emulators/suse91_aspell/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= aspell-0.50.5-38.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_aspell/Makefile.x86_64 b/emulators/suse91_aspell/Makefile.x86_64 deleted file mode 100644 index 523d98c7265..00000000000 --- a/emulators/suse91_aspell/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= aspell-0.50.5-38.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_base/DEINSTALL b/emulators/suse91_base/DEINSTALL new file mode 100644 index 00000000000..28db71f2665 --- /dev/null +++ b/emulators/suse91_base/DEINSTALL @@ -0,0 +1,27 @@ +# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:03 jlam Exp $ + +EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@" + +case "${STAGE}" in +DEINSTALL) + # Run any actions that require root privileges. + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1 + + # Blow away the /proc directory + ${RM} -fr ${EMULDIR}/proc + + # Remove a stray symlink that would normally be managed by + # ldconfig(8). + # + ${RM} -f ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1 + + # Remove some files created by pkgsrc. + ${RM} -f ${EMULDIR}/etc/ld.so.cache + ${RM} -f ${EMULDIR}/etc/mtab + ${RM} -f ${EMULDIR}/etc/group + ${RM} -f ${EMULDIR}/etc/gshadow + ${RM} -f ${EMULDIR}/etc/passwd + ${RM} -f ${EMULDIR}/etc/shadow + ;; +esac diff --git a/emulators/suse91_base/DESCR b/emulators/suse91_base/DESCR index 62e5a3f87e9..e850f8c5bb7 100644 --- a/emulators/suse91_base/DESCR +++ b/emulators/suse91_base/DESCR @@ -1,5 +1,5 @@ -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 it. -This package supports running ELF binaries linked with glibc2 which don't -require X11 shared libraries. +This package supports running ELF binaries linked with glibc2 that +don't require X11 shared libraries. diff --git a/emulators/suse91_base/INSTALL b/emulators/suse91_base/INSTALL index b4da446a9b9..6edf26b6c4f 100644 --- a/emulators/suse91_base/INSTALL +++ b/emulators/suse91_base/INSTALL @@ -1,29 +1,149 @@ -# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $ +# $NetBSD: INSTALL,v 1.4 2007/07/29 05:19:04 jlam Exp $ -case "${STAGE}" in -POST-INSTALL) - emulsubdir=linux +# Generate a +ROOT_ACTIONS script that runs certain actions that require +# superuser privileges. +# +case "${STAGE},$1" in +UNPACK,|UNPACK,+ROOT_ACTIONS) + ${CAT} > ./+ROOT_ACTIONS << 'EOF' +#!@SH@ +# +# +ROOT_ACTIONS - run actions requiring superuser privileges +# +# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir] +# +# This script runs certain actions that require superuser privileges. +# If such privileges are not available, then simply output a message +# asking the user to run this script with the appropriate elevated +# privileges. +# + +CAT="@CAT@" +CHMOD="@CHMOD@" +CP="@CP@" +ECHO="@ECHO@" +ID="@ID@" +LN="@LN@" +MKDIR="@MKDIR@" +PWD_CMD="@PWD_CMD@" +RM="@RM@" +SH="@SH@" +TEST="@TEST@" + +SELF=$0 +ACTION=$1 + +CURDIR=`${PWD_CMD}` +PKG_METADATA_DIR="${2-${CURDIR}}" +: ${PKGNAME=${PKG_METADATA_DIR##*/}} +: ${PKG_PREFIX=@PREFIX@} - emuldir="@OPSYS_EMULDIR@" - pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir" +EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@" +OPSYS_EMULDIR="@OPSYS_EMULDIR@" - emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}` - pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}` +ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done" +EUID=`${ID} -u` - if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then - if ${TEST} -e $emuldir -o -L $emuldir; then - ${CAT} << EOF +exitcode=0 +case $ACTION,$EUID in +ADD,0) + ${ECHO} "" > ${ROOT_ACTIONS_COOKIE} + ${CHMOD} g+w ${ROOT_ACTIONS_COOKIE} + # Create an appropriate Linux-like /dev directory. + ${ECHO} "${PKGNAME}: populating ${EMULDIR}/dev" + ${MKDIR} ${EMULDIR}/dev + ${TEST} ! -f /dev/MAKEDEV || + ${CP} /dev/MAKEDEV ${EMULDIR}/dev + ${TEST} ! -f /dev/MAKEDEV.subr || + ${CP} /dev/MAKEDEV.subr ${EMULDIR}/dev + ( cd ${EMULDIR}/dev && + ${SH} ./MAKEDEV std audio && + ${LN} -fs sound dsp ) + + # Create the appropriate symlink so that the kernel will + # find the installed files. + # + OPSYS_EMULDIR_PWD=`cd ${OPSYS_EMULDIR} 2>/dev/null && ${PWD_CMD}` + EMULDIR_PWD=`cd ${EMULDIR} 2>/dev/null && ${PWD_CMD}` + + if ${TEST} "${OPSYS_EMULDIR_PWD}" != "${EMULDIR_PWD}"; then + if ${TEST} -e ${OPSYS_EMULDIR} -o -L ${OPSYS_EMULDIR}; then + ${CAT} << EOM ============================================================================== -You must create a symbolic link for ${PKGNAME} to work properly: +The following symbolic link must be created for ${PKGNAME} +to work properly: - $pkgemuldir -> $emuldir + ${EMULDIR} -> ${OPSYS_EMULDIR} -It seems there is something else located at $emuldir. ============================================================================== -EOF +EOM else - ${MKDIR} -p /emul && ${LN} -fs $pkgemuldir $emuldir + ${ECHO} "${PKGNAME}: creating symlink ${EMULDIR} -> ${OPSYS_EMULDIR}" + ( ${MKDIR} -p `${DIRNAME} ${OPSYS_EMULDIR}` && + ${LN} -fs ${EMULDIR} ${OPSYS_EMULDIR} ) || ${TRUE} fi fi ;; + +REMOVE,0) + ${ECHO} "${PKGNAME}: removing ${EMULDIR}/dev" + ${RM} -fr ${EMULDIR}/dev + ${RM} -f ${ROOT_ACTIONS_COOKIE} + ;; + +ADD,*) + if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to complete +the installation of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} ADD + +============================================================================== +EOM + fi + ;; + +REMOVE,*) + if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to begin the +removal of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} REMOVE + +Then, please run pkg_delete(1) again to complete the removal of this +package. + +============================================================================== +EOM + exitcode=1 + fi + ;; +esac +exit $exitcode + +EOF + ${CHMOD} +x ./+ROOT_ACTIONS + ;; +esac + +EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@" +OPSYS_EMULDIR="@OPSYS_EMULDIR@" + +case "${STAGE}" in +POST-INSTALL) + # Create a /proc mount point. + ${MKDIR} -p ${EMULDIR}/proc + + # Make /etc/mtab usable for Linux programs. + ${RM} -f ${EMULDIR}/etc/mtab + ${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab + + # Run any actions that require root privileges. + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR} + ;; esac diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile index 7efa78acf65..d06b6b431cb 100644 --- a/emulators/suse91_base/Makefile +++ b/emulators/suse91_base/Makefile @@ -1,29 +1,18 @@ -# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:28 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2007/07/29 05:19:04 jlam Exp $ -DISTNAME= suse_base-${SUSE_VERSION} -PKGREVISION= 12 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_base-${SUSE_VERSION} +PKGREVISION= 13 +CATEGORIES= emulators -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package -CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* +CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* -# these files are handled by manually during de-/installation/pkg_add -CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.* -CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache -CHECK_INTERPRETER_SKIP+= ${PREFIX}/${EMULSUBDIR}/* - -EXTRACT_ONLY= # empty -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q} - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +# These files are managed by the +INSTALL/+DEINSTALL scripts. +CHECK_FILES_SKIP+= ${EMULDIR}/dev/.* +CHECK_FILES_SKIP+= ${EMULDIR}/etc/ld.so.cache +CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libz.so.1 RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \ ./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \ @@ -32,48 +21,34 @@ RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \ ./etc/pam.d ./etc/profile ./etc/profile.dos \ ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype -LINUX_LDD= ${PREFIX}/${EMULSUBDIR}/usr/bin/ldd -LINUX_LIB?= lib - -.include "../../mk/bsd.prefs.mk" +LINUX_LDD= ${EMULDIR}/usr/bin/ldd +LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig INSTALLATION_DIRS= sbin +OWN_DIRS+= ${EMULSUBDIR} + +SUBST_CLASSES+= suse +SUBST_STAGE.suse= do-build +SUBST_FILES.suse= SuSE-release linux-mkpwd.sh +SUBST_VARS.suse= EMULDIR SUSE_ARCH SUSE_VERSION + +# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to +# the correct type. +# +BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}} -do-build: - @for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \ - ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \ - -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \ - -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \ - -e 's#@@VERSION@@#${SUSE_VERSION}#g' \ - -e 's#@@ARCH@@#${SUSE_ARCH}#g' \ - $$FILE >${WRKDIR}/`basename $$FILE`; \ - done +post-extract: + ${CP} ${FILESDIR}/SuSE-release ${WRKSRC} + ${CP} ${FILESDIR}/*.sh ${WRKSRC} do-install: - for FILE in ${WRKDIR}/*.sh; do \ - ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \ - done - ${INSTALL_DATA_DIR} ${EMULDIR}/dev - ${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev - cd ${EMULDIR}/dev && ${SH} ./MAKEDEV std audio - cd ${EMULDIR}/dev && ${LN} -fs sound dsp - @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - ${RPM2PKG} ${RPM2PKGARGS} - ${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC} - ${INSTALL_DATA} ${WRKDIR}/SuSE-release ${EMULDIR}/etc - ${INSTALL_DATA_DIR} ${EMULDIR}/proc - ${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab -.if ${OPSYS} == "FreeBSD" - ${BRANDELF} -t Linux ${EMULDIR}/sbin/ldconfig -.endif - ${EMULDIR}/sbin/ldconfig -r ${EMULDIR} - ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \ - >>${PLIST_SRC} - ${ECHO} "@unexec ${RMDIR} %D/${EMULSUBDIR}/etc 2>/dev/null || ${TRUE}" \ - >>${PLIST_SRC} + ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \ + ${PREFIX}/sbin/${LINUX_BASE}-mkpwd + ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc + ${BRANDELF_CMD} ${SED} -e 's:#! :#! ${EMULDIR}:' \ -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \ - < ${LINUX_LDD} > ${LINUX_LDD}.new + ${LINUX_LDD} > ${LINUX_LDD}.new ${MV} ${LINUX_LDD}.new ${LINUX_LDD} ${CHMOD} +x ${LINUX_LDD} diff --git a/emulators/suse91_base/Makefile.i386 b/emulators/suse91_base/Makefile.i386 deleted file mode 100644 index 39285912de1..00000000000 --- a/emulators/suse91_base/Makefile.i386 +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.3 2005/11/06 14:52:43 salo Exp $ - -RPMFILES= aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \ - bash-2.05b-305.1.${SUSE_ARCH}.rpm \ - coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \ - glibc-2.3.3-98.${SUSE_ARCH}.rpm \ - libgcc-3.3.3-41.${SUSE_ARCH}.rpm \ - libacl-2.2.21-54.4.${SUSE_ARCH}.rpm \ - libattr-2.4.12-56.${SUSE_ARCH}.rpm \ - libselinux-1.8-16.${SUSE_ARCH}.rpm \ - libstdc++-3.3.3-41.${SUSE_ARCH}.rpm \ - ncurses-5.4-61.3.${SUSE_ARCH}.rpm \ - readline-4.3-306.${SUSE_ARCH}.rpm \ - zlib-1.2.1-70.12.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_base/Makefile.x86_64 b/emulators/suse91_base/Makefile.x86_64 deleted file mode 100644 index ae359fb2ce8..00000000000 --- a/emulators/suse91_base/Makefile.x86_64 +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.4 2007/02/22 19:26:28 wiz Exp $ - -RPMFILES= aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \ - bash-2.05b-305.1.${SUSE_ARCH}.rpm \ - coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \ - glibc-2.3.3-63.${SUSE_ARCH}.rpm \ - libgcc-3.3.3-33.${SUSE_ARCH}.rpm \ - libacl-2.2.21-54.4.${SUSE_ARCH}.rpm \ - libattr-2.4.12-44.${SUSE_ARCH}.rpm \ - libselinux-1.8-15.${SUSE_ARCH}.rpm \ - libstdc++-3.3.3-33.${SUSE_ARCH}.rpm \ - ncurses-5.4-61.3.${SUSE_ARCH}.rpm \ - readline-4.3-301.${SUSE_ARCH}.rpm \ - zlib-1.2.1-70.12.${SUSE_ARCH}.rpm - -LINUX_LIB= lib64 diff --git a/emulators/suse91_base/PLIST b/emulators/suse91_base/PLIST index 645527486fc..8888643a35e 100644 --- a/emulators/suse91_base/PLIST +++ b/emulators/suse91_base/PLIST @@ -1,15 +1,3 @@ -@comment $NetBSD: PLIST,v 1.5 2005/08/16 00:30:41 dmcmahill Exp $ -sbin/linux-mkpwd -@unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache -${EMULSUBDIR}/etc/SuSE-release -${EMULSUBDIR}/etc/mtab -${EMULSUBDIR}/usr/${LINUX_LIB}/libz.so.1 -@exec ${MKDIR} %D/${EMULSUBDIR}/proc -@dirrm ${EMULSUBDIR}/proc -@unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow -@exec ${MKDIR} %D/${EMULSUBDIR}/dev -@exec cp -p /dev/MAKEDEV %D/${EMULSUBDIR}/dev -@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio -@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp -@unexec ${RM} -f %D/${EMULSUBDIR}/dev/* -@dirrm ${EMULSUBDIR}/dev +@comment $NetBSD: PLIST,v 1.6 2007/07/29 05:19:04 jlam Exp $ +sbin/${LINUX_BASE}-mkpwd +${EMULSUBDIRSLASH}etc/SuSE-release diff --git a/emulators/suse91_base/files/SuSE-release b/emulators/suse91_base/files/SuSE-release index 247032986b2..728e5a77870 100644 --- a/emulators/suse91_base/files/SuSE-release +++ b/emulators/suse91_base/files/SuSE-release @@ -1,2 +1,2 @@ -SuSE Linux @@VERSION@@ (@@ARCH@@) -VERSION = @@VERSION@@ +SuSE Linux @SUSE_VERSION@ (@SUSE_ARCH@) +VERSION = @SUSE_VERSION@ diff --git a/emulators/suse91_base/files/linux-mkpwd.sh b/emulators/suse91_base/files/linux-mkpwd.sh index 1fd4c3626bf..ea43d25adc3 100644 --- a/emulators/suse91_base/files/linux-mkpwd.sh +++ b/emulators/suse91_base/files/linux-mkpwd.sh @@ -1,13 +1,31 @@ #!/bin/sh # -# $NetBSD: linux-mkpwd.sh,v 1.1.1.1 2004/07/13 10:31:14 tron Exp $ +# $NetBSD: linux-mkpwd.sh,v 1.2 2007/07/29 05:19:05 jlam Exp $ +# + +###################################################################### +# +# NAME +# @LINUX_BASE@-mkpwd -- create passwd/group files for COMPAT_LINUX +# +# SYNOPSYS +# @LINUX_BASE@-mkpwd +# +# DESCRIPTION +# @LINUX_BASE@-mkpwd creates passwd and group files and databases +# for a COMPAT_LINUX installation based on the files found in +# /etc, e.g. /etc/passwd, /etc/master.passwd, /etc/group, etc. +# +###################################################################### SRCDIR=/etc -DESTDIR=@@EMULDIR@@/etc +DESTDIR=@EMULDIR@/etc + +[ -d $DESTDIR ] || exit 1 umask 22 cd $DESTDIR -cp $SRCDIR/passwd . +cp -f $SRCDIR/passwd . sed s/^wheel:/root:/ <$SRCDIR/group >group umask 77 diff --git a/emulators/suse91_base/suse.i386.mk b/emulators/suse91_base/suse.i386.mk new file mode 100644 index 00000000000..1850283ca1a --- /dev/null +++ b/emulators/suse91_base/suse.i386.mk @@ -0,0 +1,15 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:05 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES+= aaa_base-9.1-0.29.${SUSE_ARCH}.rpm +DISTFILES+= bash-2.05b-305.1.${SUSE_ARCH}.rpm +DISTFILES+= coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm +DISTFILES+= glibc-2.3.3-98.${SUSE_ARCH}.rpm +DISTFILES+= libacl-2.2.21-54.4.${SUSE_ARCH}.rpm +DISTFILES+= libattr-2.4.12-56.${SUSE_ARCH}.rpm +DISTFILES+= libgcc-3.3.3-41.${SUSE_ARCH}.rpm +DISTFILES+= libselinux-1.8-16.${SUSE_ARCH}.rpm +DISTFILES+= libstdc++-3.3.3-41.${SUSE_ARCH}.rpm +DISTFILES+= ncurses-5.4-61.3.${SUSE_ARCH}.rpm +DISTFILES+= readline-4.3-306.${SUSE_ARCH}.rpm +DISTFILES+= zlib-1.2.1-70.12.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_base/suse.x86_64.mk b/emulators/suse91_base/suse.x86_64.mk new file mode 100644 index 00000000000..884314e8131 --- /dev/null +++ b/emulators/suse91_base/suse.x86_64.mk @@ -0,0 +1,17 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:05 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES+= aaa_base-9.1-0.29.${SUSE_ARCH}.rpm +DISTFILES+= bash-2.05b-305.1.${SUSE_ARCH}.rpm +DISTFILES+= coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm +DISTFILES+= glibc-2.3.3-63.${SUSE_ARCH}.rpm +DISTFILES+= libacl-2.2.21-54.4.${SUSE_ARCH}.rpm +DISTFILES+= libattr-2.4.12-44.${SUSE_ARCH}.rpm +DISTFILES+= libgcc-3.3.3-33.${SUSE_ARCH}.rpm +DISTFILES+= libselinux-1.8-15.${SUSE_ARCH}.rpm +DISTFILES+= libstdc++-3.3.3-33.${SUSE_ARCH}.rpm +DISTFILES+= ncurses-5.4-61.3.${SUSE_ARCH}.rpm +DISTFILES+= readline-4.3-301.${SUSE_ARCH}.rpm +DISTFILES+= zlib-1.2.1-70.12.${SUSE_ARCH}.rpm + +LINUX_LIBSUBDIR= lib64 diff --git a/emulators/suse91_compat/DESCR b/emulators/suse91_compat/DESCR index addf8028f9b..573641b8dea 100644 --- a/emulators/suse91_compat/DESCR +++ b/emulators/suse91_compat/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 contains some old shared libraries required for backwards -compatibility. +This package contains some old shared libraries required by older +Linux binaries. diff --git a/emulators/suse91_compat/Makefile b/emulators/suse91_compat/Makefile index 6eb8164602c..7320d0bf46e 100644 --- a/emulators/suse91_compat/Makefile +++ b/emulators/suse91_compat/Makefile @@ -1,24 +1,13 @@ -# $NetBSD: Makefile,v 1.9 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:05 jlam Exp $ -DISTNAME= suse_compat-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_compat-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package with old shared libraries +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package with old shared libraries -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_compat/Makefile.i386 b/emulators/suse91_compat/Makefile.i386 deleted file mode 100644 index c91f756b2ad..00000000000 --- a/emulators/suse91_compat/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= compat-2004.4.2-3.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_compat/Makefile.x86_64 b/emulators/suse91_compat/Makefile.x86_64 deleted file mode 100644 index 1c784525b32..00000000000 --- a/emulators/suse91_compat/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= compat-2004.4.2-2.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_compat/suse.i386.mk b/emulators/suse91_compat/suse.i386.mk new file mode 100644 index 00000000000..582642f54e7 --- /dev/null +++ b/emulators/suse91_compat/suse.i386.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:06 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES= compat-2004.4.2-3.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_compat/suse.x86_64.mk b/emulators/suse91_compat/suse.x86_64.mk new file mode 100644 index 00000000000..13dd631136e --- /dev/null +++ b/emulators/suse91_compat/suse.x86_64.mk @@ -0,0 +1,3 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:06 jlam Exp $ + +DISTFILES= compat-2004.4.2-2.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_expat/DESCR b/emulators/suse91_expat/DESCR index 9f2f36c8801..4a64e91260e 100644 --- a/emulators/suse91_expat/DESCR +++ b/emulators/suse91_expat/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 -expat shared libraries. +This package supports running ELF binaries linked with glibc2 that +require expat shared libraries. diff --git a/emulators/suse91_expat/Makefile b/emulators/suse91_expat/Makefile index 2dfa1483d29..08fba9dfe6b 100644 --- a/emulators/suse91_expat/Makefile +++ b/emulators/suse91_expat/Makefile @@ -1,25 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:06 jlam Exp $ -DISTNAME= suse_expat-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_expat-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for expat binaries +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for expat -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -LIBTOOLIZE_PLIST= NO -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_expat/Makefile.i386 b/emulators/suse91_expat/Makefile.i386 deleted file mode 100644 index 385044ba27f..00000000000 --- a/emulators/suse91_expat/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= expat-1.95.7-37.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_expat/Makefile.x86_64 b/emulators/suse91_expat/Makefile.x86_64 deleted file mode 100644 index b29da228bdc..00000000000 --- a/emulators/suse91_expat/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= expat-1.95.7-31.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_expat/suse.i386.mk b/emulators/suse91_expat/suse.i386.mk new file mode 100644 index 00000000000..14e0cb99566 --- /dev/null +++ b/emulators/suse91_expat/suse.i386.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:07 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES= expat-1.95.7-37.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_expat/suse.x86_64.mk b/emulators/suse91_expat/suse.x86_64.mk new file mode 100644 index 00000000000..8d90a9c7639 --- /dev/null +++ b/emulators/suse91_expat/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:07 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES= expat-1.95.7-31.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_fontconfig/DESCR b/emulators/suse91_fontconfig/DESCR index fffa11f3d2e..48a1e2cd2ab 100644 --- a/emulators/suse91_fontconfig/DESCR +++ b/emulators/suse91_fontconfig/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 -fontconfig shared libraries. +This package supports running ELF binaries linked with glibc2 that +require fontconfig shared libraries. diff --git a/emulators/suse91_fontconfig/Makefile b/emulators/suse91_fontconfig/Makefile index fd6f9996d92..e8f661ea773 100644 --- a/emulators/suse91_fontconfig/Makefile +++ b/emulators/suse91_fontconfig/Makefile @@ -1,25 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:07 jlam Exp $ -DISTNAME= suse_fontconfig-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_fontconfig-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for fontconfig binaries +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for fontconfig -DEPENDS+= suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse91_expat -DEPENDS+= suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= expat freetype2 .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_fontconfig/Makefile.i386 b/emulators/suse91_fontconfig/Makefile.i386 deleted file mode 100644 index 430ee8a916d..00000000000 --- a/emulators/suse91_fontconfig/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_fontconfig/Makefile.x86_64 b/emulators/suse91_fontconfig/Makefile.x86_64 deleted file mode 100644 index d8374752a9c..00000000000 --- a/emulators/suse91_fontconfig/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_fontconfig/suse.i386.mk b/emulators/suse91_fontconfig/suse.i386.mk new file mode 100644 index 00000000000..03ebb5bf3a1 --- /dev/null +++ b/emulators/suse91_fontconfig/suse.i386.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:08 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES= fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_fontconfig/suse.x86_64.mk b/emulators/suse91_fontconfig/suse.x86_64.mk new file mode 100644 index 00000000000..a4aad7e7512 --- /dev/null +++ b/emulators/suse91_fontconfig/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:08 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES= fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_freetype2/DESCR b/emulators/suse91_freetype2/DESCR index b54860cc766..9d1ced14b3a 100644 --- a/emulators/suse91_freetype2/DESCR +++ b/emulators/suse91_freetype2/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 freetype2 shared -libraries. +This package supports running ELF binaries linked with glibc2 that +require freetype2 shared libraries. diff --git a/emulators/suse91_freetype2/Makefile b/emulators/suse91_freetype2/Makefile index d8744d8d29b..5d34255e21d 100644 --- a/emulators/suse91_freetype2/Makefile +++ b/emulators/suse91_freetype2/Makefile @@ -1,24 +1,14 @@ -# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:09 jlam Exp $ -DISTNAME= suse_freetype2-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_freetype2-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators +DISTFILES= freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for FreeType2 library +MAINTAINER= jdolecek@NetBSD.org +COMMENT= Linux compatibility package for freetype-2.x -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_freetype2/Makefile.i386 b/emulators/suse91_freetype2/Makefile.i386 deleted file mode 100644 index f1c2ac608af..00000000000 --- a/emulators/suse91_freetype2/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_freetype2/Makefile.x86_64 b/emulators/suse91_freetype2/Makefile.x86_64 deleted file mode 100644 index d56fe5b8d74..00000000000 --- a/emulators/suse91_freetype2/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gdk-pixbuf/DESCR b/emulators/suse91_gdk-pixbuf/DESCR index b898081b301..dc8cea9566b 100644 --- a/emulators/suse91_gdk-pixbuf/DESCR +++ b/emulators/suse91_gdk-pixbuf/DESCR @@ -1,4 +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 that use gdk-pixbuf shared libraries. +This package supports running ELF binaries linked with glibc2 that +require gdk-pixbuf shared libraries. diff --git a/emulators/suse91_gdk-pixbuf/Makefile b/emulators/suse91_gdk-pixbuf/Makefile index e85b3403e58..7e67ece3568 100644 --- a/emulators/suse91_gdk-pixbuf/Makefile +++ b/emulators/suse91_gdk-pixbuf/Makefile @@ -1,24 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:10 jlam Exp $ -DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION} -PKGREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION} +PKGREVISION= 2 +CATEGORIES= emulators +DISTFILES= gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for gdk-pixbuf binaries +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package for gdk-pixbuf -DEPENDS+= suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse91_gtk - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= gtk .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_gdk-pixbuf/Makefile.i386 b/emulators/suse91_gdk-pixbuf/Makefile.i386 deleted file mode 100644 index 60245f8ddd3..00000000000 --- a/emulators/suse91_gdk-pixbuf/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/03/06 09:10:54 toddpw Exp $ - -RPMFILES= gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gdk-pixbuf/Makefile.x86_64 b/emulators/suse91_gdk-pixbuf/Makefile.x86_64 deleted file mode 100644 index a514ad2fa53..00000000000 --- a/emulators/suse91_gdk-pixbuf/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/06/26 19:41:05 salo Exp $ - -RPMFILES= gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_glx/DESCR b/emulators/suse91_glx/DESCR index 64e8143cf19..15d0f9e4737 100644 --- a/emulators/suse91_glx/DESCR +++ b/emulators/suse91_glx/DESCR @@ -1,4 +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 which require GL shared libraries. +This package supports running ELF binaries linked with glibc2 that +require OpenGL/Mesa shared libraries. diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile index 89dce049d69..211ebf3cf55 100644 --- a/emulators/suse91_glx/Makefile +++ b/emulators/suse91_glx/Makefile @@ -1,26 +1,16 @@ -# $NetBSD: Makefile,v 1.9 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:10 jlam Exp $ -DISTNAME= suse_glx-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_glx-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the GL library +MAINTAINER= jdolecek@NetBSD.org +COMMENT= Linux compatibility package for OpenGL/Mesa -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11 +EMUL_MODULES.linux= base x11 -EXTRACT_ONLY= # empty -NO_BUILD= YES -LIBTOOLIZE_PLIST= NO -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +# This symlink is managed by ldconfig(8). +CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libglide3.so.3 .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_glx/Makefile.i386 b/emulators/suse91_glx/Makefile.i386 deleted file mode 100644 index 1d62be013d2..00000000000 --- a/emulators/suse91_glx/Makefile.i386 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -# the -devel version is necessary for libGL.so et.al. symlinks only -RPMFILES= XFree86-Mesa-4.3.99.902-40.${SUSE_ARCH}.rpm \ - XFree86-Mesa-devel-4.3.99.902-40.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_glx/Makefile.x86_64 b/emulators/suse91_glx/Makefile.x86_64 deleted file mode 100644 index 8995bac4a7c..00000000000 --- a/emulators/suse91_glx/Makefile.x86_64 +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -# the -devel version is necessary for libGL.so et.al. symlinks only -RPMFILES= XFree86-Mesa-4.3.99.902-30.${SUSE_ARCH}.rpm \ - XFree86-Mesa-devel-4.3.99.902-30.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_glx/PLIST_rpmfix.i386 b/emulators/suse91_glx/PLIST_rpmfix.i386 deleted file mode 100644 index dd21e4f6b71..00000000000 --- a/emulators/suse91_glx/PLIST_rpmfix.i386 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/05/08 20:39:30 joerg Exp $ -/usr/lib/libglide3.so.3 diff --git a/emulators/suse91_glx/suse.i386.mk b/emulators/suse91_glx/suse.i386.mk new file mode 100644 index 00000000000..1715dfc013c --- /dev/null +++ b/emulators/suse91_glx/suse.i386.mk @@ -0,0 +1,7 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:11 jlam Exp $ + +# SuSE i386 RPMs; the -devel version is necessary for libGL.so et.al. +# symlinks only. +# +DISTFILES+= XFree86-Mesa-4.3.99.902-40.${SUSE_ARCH}.rpm +DISTFILES+= XFree86-Mesa-devel-4.3.99.902-40.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_glx/suse.x86_64.mk b/emulators/suse91_glx/suse.x86_64.mk new file mode 100644 index 00000000000..70cfd8562b6 --- /dev/null +++ b/emulators/suse91_glx/suse.x86_64.mk @@ -0,0 +1,7 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:11 jlam Exp $ + +# SuSE x86_64 RPMs; the -devel version is necessary for libGL.so et.al. +# symlinks only. +# +DISTFILES+= XFree86-Mesa-4.3.99.902-30.${SUSE_ARCH}.rpm +DISTFILES+= XFree86-Mesa-devel-4.3.99.902-30.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk/DESCR b/emulators/suse91_gtk/DESCR index d404f886f92..91db428d711 100644 --- a/emulators/suse91_gtk/DESCR +++ b/emulators/suse91_gtk/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 -GTK shared libraries. +This package supports running ELF binaries linked with glibc2 that +require GTK+-1.x shared libraries. diff --git a/emulators/suse91_gtk/Makefile b/emulators/suse91_gtk/Makefile index 2a187566fef..3cfacc1fb84 100644 --- a/emulators/suse91_gtk/Makefile +++ b/emulators/suse91_gtk/Makefile @@ -1,24 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:11 jlam Exp $ -DISTNAME= suse_gtk-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_gtk-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for GTK binaries +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package for GTK+-1.x -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= x11 .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_gtk/Makefile.i386 b/emulators/suse91_gtk/Makefile.i386 deleted file mode 100644 index 883b9470196..00000000000 --- a/emulators/suse91_gtk/Makefile.i386 +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= glib-1.2.10-586.${SUSE_ARCH}.rpm \ - gtk-1.2.10-877.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk/Makefile.x86_64 b/emulators/suse91_gtk/Makefile.x86_64 deleted file mode 100644 index ba01c9328f2..00000000000 --- a/emulators/suse91_gtk/Makefile.x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= glib-1.2.10-337.${SUSE_ARCH}.rpm \ - gtk-1.2.10-488.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk/suse.i386.mk b/emulators/suse91_gtk/suse.i386.mk new file mode 100644 index 00000000000..bfce4b4d35c --- /dev/null +++ b/emulators/suse91_gtk/suse.i386.mk @@ -0,0 +1,5 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:12 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES+= glib-1.2.10-586.${SUSE_ARCH}.rpm +DISTFILES+= gtk-1.2.10-877.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_gtk/suse.x86_64.mk b/emulators/suse91_gtk/suse.x86_64.mk new file mode 100644 index 00000000000..ee58f28e5de --- /dev/null +++ b/emulators/suse91_gtk/suse.x86_64.mk @@ -0,0 +1,5 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:12 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES+= glib-1.2.10-337.${SUSE_ARCH}.rpm +DISTFILES+= gtk-1.2.10-488.${SUSE_ARCH}.rpm 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 diff --git a/emulators/suse91_libjpeg/DESCR b/emulators/suse91_libjpeg/DESCR index 3fe7a54d422..b9297dc4d48 100644 --- a/emulators/suse91_libjpeg/DESCR +++ b/emulators/suse91_libjpeg/DESCR @@ -1,4 +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 jpeg shared libraries. +This package supports running ELF binaries linked with glibc2 that +require JPEG shared libraries. diff --git a/emulators/suse91_libjpeg/Makefile b/emulators/suse91_libjpeg/Makefile index 787de19eb01..400f688203e 100644 --- a/emulators/suse91_libjpeg/Makefile +++ b/emulators/suse91_libjpeg/Makefile @@ -1,25 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:14 jlam Exp $ -DISTNAME= suse_libjpeg-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libjpeg-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the JPEG library +MAINTAINER= jdolecek@NetBSD.org +COMMENT= Linux compatibility package for JPEG -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -LIBTOOLIZE_PLIST= NO -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_libjpeg/Makefile.i386 b/emulators/suse91_libjpeg/Makefile.i386 deleted file mode 100644 index bebaf49e1d0..00000000000 --- a/emulators/suse91_libjpeg/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= libjpeg-6.2.0-731.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libjpeg/Makefile.x86_64 b/emulators/suse91_libjpeg/Makefile.x86_64 deleted file mode 100644 index 13d221541f1..00000000000 --- a/emulators/suse91_libjpeg/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= libjpeg-6.2.0-320.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libjpeg/suse.i386.mk b/emulators/suse91_libjpeg/suse.i386.mk new file mode 100644 index 00000000000..3dbc2cd8040 --- /dev/null +++ b/emulators/suse91_libjpeg/suse.i386.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:15 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES= libjpeg-6.2.0-731.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libjpeg/suse.x86_64.mk b/emulators/suse91_libjpeg/suse.x86_64.mk new file mode 100644 index 00000000000..daadbfaf3cb --- /dev/null +++ b/emulators/suse91_libjpeg/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:15 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILSE= libjpeg-6.2.0-320.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libpng/DESCR b/emulators/suse91_libpng/DESCR index f330608b9fc..23bdd4b7227 100644 --- a/emulators/suse91_libpng/DESCR +++ b/emulators/suse91_libpng/DESCR @@ -1,4 +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 png shared libraries. +This package supports running ELF binaries linked with glibc2 that +require PNG shared libraries. diff --git a/emulators/suse91_libpng/Makefile b/emulators/suse91_libpng/Makefile index 35a359d5979..47023ba6c68 100644 --- a/emulators/suse91_libpng/Makefile +++ b/emulators/suse91_libpng/Makefile @@ -1,24 +1,14 @@ -# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.11 2007/07/29 05:19:15 jlam Exp $ -DISTNAME= suse_libpng-${SUSE_VERSION} -PKGREVISION= 5 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libpng-${SUSE_VERSION} +PKGREVISION= 6 +CATEGORIES= emulators +DISTFILES= libpng-1.2.5-182.10.${SUSE_ARCH}.rpm -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the PNG library +MAINTAINER= jdolecek@NetBSD.org +COMMENT= Linux compatibility package for PNG -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_libpng/Makefile.i386 b/emulators/suse91_libpng/Makefile.i386 deleted file mode 100644 index 0e3b3e5c8e3..00000000000 --- a/emulators/suse91_libpng/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= libpng-1.2.5-182.10.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libpng/Makefile.x86_64 b/emulators/suse91_libpng/Makefile.x86_64 deleted file mode 100644 index 0ee1a4dab46..00000000000 --- a/emulators/suse91_libpng/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= libpng-1.2.5-182.10.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libtiff/DESCR b/emulators/suse91_libtiff/DESCR index 6eb5ded69a7..8a6de414578 100644 --- a/emulators/suse91_libtiff/DESCR +++ b/emulators/suse91_libtiff/DESCR @@ -1,4 +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 tiff shared libraries. +This package supports running ELF binaries linked with glibc2 that +require TIFF shared libraries. diff --git a/emulators/suse91_libtiff/Makefile b/emulators/suse91_libtiff/Makefile index 9f041b349f0..cfd6017066f 100644 --- a/emulators/suse91_libtiff/Makefile +++ b/emulators/suse91_libtiff/Makefile @@ -1,24 +1,14 @@ -# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.11 2007/07/29 05:19:16 jlam Exp $ -DISTNAME= suse_libtiff-${SUSE_VERSION} -PKGREVISION= 5 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_libtiff-${SUSE_VERSION} +PKGREVISION= 6 +CATEGORIES= emulators +DISTFILES= libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the TIFF library +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for TIFF -DEPENDS+= suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libjpeg - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= jpeg .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_libtiff/Makefile.i386 b/emulators/suse91_libtiff/Makefile.i386 deleted file mode 100644 index 2922a4cd03a..00000000000 --- a/emulators/suse91_libtiff/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.2 2006/06/26 19:42:26 salo Exp $ - -RPMFILES= libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_libtiff/Makefile.x86_64 b/emulators/suse91_libtiff/Makefile.x86_64 deleted file mode 100644 index 46042d91c9c..00000000000 --- a/emulators/suse91_libtiff/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.2 2006/06/26 19:42:26 salo Exp $ - -RPMFILES= libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common index d5b873ae048..f672d42f045 100644 --- a/emulators/suse91_linux/Makefile.common +++ b/emulators/suse91_linux/Makefile.common @@ -1,87 +1,70 @@ -# $NetBSD: Makefile.common,v 1.16 2007/01/23 16:54:59 joerg Exp $ +# $NetBSD: Makefile.common,v 1.17 2007/07/29 05:19:17 jlam Exp $ -.include "../../emulators/suse91_linux/vars.mk" -.include "../../emulators/suse91_linux/arch.mk" +SUSE_PKG= yes +SUSE_VERSION= 9.1 +SUSE_VERSION_REQD= ${SUSE_VERSION} -ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \ - NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \ - DragonFly-*-i386 +EMUL_PLATFORMS?= linux-i386 linux-x86_64 -_SUSE_FTP_SUBDIR= suse/discontinued/${SUSE_ARCH_DIR}/9.1/suse/${SUSE_ARCH}/ -_SUSE_FTP_SUBDIR_UPD= suse/discontinued/${SUSE_ARCH_DIR}/update/9.1/rpm/${SUSE_ARCH}/ +.include "../../mk/bsd.prefs.mk" -MASTER_SITE_SUSE91?= ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR} \ - ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} \ - ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR} \ - ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \ - ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR} \ - ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \ - ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR} \ - ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR_UPD} \ - ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR:C/^suse/suse\/pub/} \ - ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR_UPD:C/^suse/suse\/pub/} +# The SuSE 10.x Linux packages are only usable on the following platforms. +ONLY_FOR_PLATFORM+= DragonFly-*-i386 +ONLY_FOR_PLATFORM+= FreeBSD-*-i386 +ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 +ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures. +_SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH} +_SUSE_ARCH.i386= i586 +_SUSE_ARCH= ${_SUSE_ARCH.${EMUL_ARCH}} +SUSE_ARCH= ${_SUSE_ARCH} + +_SUSE_FTP_SUBDIR= suse/discontinued/${MACHINE_ARCH}/9.1/suse/${SUSE_ARCH}/ +_SUSE_FTP_SUBDIR_UPD= suse/discontinued/${MACHINE_ARCH}/update/9.1/rpm/${SUSE_ARCH}/ + +MASTER_SITE_SUSE_${SUSE_VERSION}= \ + ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR} \ + ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} \ + ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR} \ + ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \ + ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR} \ + ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \ + ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR} \ + ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR_UPD} \ + ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR:C/^suse/suse\/pub/} \ + ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR_UPD:C/^suse/suse\/pub/} + +MASTER_SITES?= ${MASTER_SITE_SUSE_${SUSE_VERSION}} DIST_SUBDIR?= suse${SUSE_VERSION:S/.//}/${SUSE_ARCH} +HOMEPAGE?= http://www.suse.com/ + WRKSRC?= ${WRKDIR} +BUILD_DIRS?= # empty MANCOMPRESSED?= yes -EMULSUBDIR= emul/linux -EMULDIR= ${PREFIX}/${EMULSUBDIR} +EMUL_PKG_FMT?= rpm +RPM2PKG_PREFIX?= ${PREFIX} +RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} +RPM2PKG_STAGE?= do-install -# Set location of OPSYS-specific emulation directory -.if ${OPSYS} == "NetBSD" -OPSYS_EMULDIR= /${EMULSUBDIR} -.elif (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly") -OPSYS_EMULDIR= /compat/${EMULSUBDIR:T} +.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") +PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} +COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} +LINUX_BASE= linux32 .else -OPSYS_EMULDIR= /${EMULSUBDIR} -.endif -FILES_SUBST+= OPSYS_EMULDIR=${OPSYS_EMULDIR:Q} - -RPM2PKG= ${PREFIX}/sbin/rpm2pkg -BUILD_DEPENDS+= rpm2pkg>=2.1:../../pkgtools/rpm2pkg - -BUILD_DEFS+= RPMFILES -.if defined(RPMIGNOREPATH) -BUILD_DEFS+= RPMIGNOREPATH +LINUX_BASE= linux .endif +PLIST_SUBST+= LINUX_BASE=${LINUX_BASE:Q} +FILES_SUBST+= LINUX_BASE=${LINUX_BASE:Q} -# The SuSE Linux packages have circular dependencies. -LDD?= ${TRUE} +LINUX_LIBSUBDIR?= lib +PLIST_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} +FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} -RPM2PKGSTRIP?= 1 -RPM2PKGARGS?= -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR} -.if empty(RPM2PKGSTRIP:M0) -RPM2PKGARGS+= -s ${RPM2PKGSTRIP} -.endif -.for TEMP in ${RPMIGNOREPATH} -RPM2PKGARGS+= -i ${TEMP} -.endfor -.for TEMP in ${RPMFILES} -RPM2PKGARGS+= ${DISTDIR}/${DIST_SUBDIR}/${TEMP} -.endfor - -.if !target(do-install) -do-install: - @if [ -f ${PKGDIR}/PLIST ]; then \ - ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \ - else \ - ${RM} -f ${PLIST_SRC}; \ - ${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \ - fi - @if [ -f ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} ]; then \ - ${SED} -e 's,^/,${EMULSUBDIR}/,' ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} >> ${PLIST_SRC}; \ - fi - ${RPM2PKG} ${RPM2PKGARGS} - @if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \ - ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \ - ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \ - ${MV} -f ${PLIST_SRC} ${PLIST_SRC}.old; \ - ${GREP} -v '^@dirrm' ${PLIST_SRC}.old >${PLIST_SRC} || ${TRUE}; \ - ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \ - ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \ - ${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \ - ${RM} -f ${PLIST_SRC}.old; \ - fi -.endif +# Include an "override" SuSE-specific and architecture-specific +# Makefile fragment if it exists. +# +.sinclude "suse.${EMUL_ARCH}.mk" diff --git a/emulators/suse91_linux/arch.mk b/emulators/suse91_linux/arch.mk deleted file mode 100644 index c4db621bfeb..00000000000 --- a/emulators/suse91_linux/arch.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: arch.mk,v 1.1.1.1 2004/07/13 10:31:15 tron Exp $ - -.ifndef SUSE_ARCH_MK -SUSE_ARCH_MK=1 - -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" -SUSE_ARCH?= i586 -SUSE_ARCH_DIR?= ${MACHINE_ARCH} -.elif ${MACHINE_ARCH} == "powerpc" -SUSE_ARCH?= ppc -.else -SUSE_ARCH?= ${MACHINE_ARCH} -.endif - -SUSE_ARCH_DIR?= ${SUSE_ARCH} - -.endif # SUSE_ARCH_MK diff --git a/emulators/suse91_linux/emulator.mk b/emulators/suse91_linux/emulator.mk new file mode 100644 index 00000000000..1ec73cab815 --- /dev/null +++ b/emulators/suse91_linux/emulator.mk @@ -0,0 +1,47 @@ +# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:19:17 jlam Exp $ +# +# This file is included by linux-suse.mk in the emulator framework. +# +# Variables set by this file: +# +# EMUL_DISTRO +# The SuSE Linux distribution. +# +# DEPENDS_${EMUL_DISTRO}.* +# A table that maps "modules" to SuSE package dependencies. +# + +EMUL_DISTRO= suse-9.1 + +.if defined(SUSE_PKG) +_SUSE_VERSION_REQD= -${SUSE_VERSION_REQD}{,nb*} +.else +_SUSE_VERSION_REQD= >=${SUSE_VERSION_REQD} +.endif + +# DEPENDS_suse-9.1.* maps Linux "modules" to SuSE package dependencies. +DEPENDS_suse-9.1.aspell?= suse_aspell${_SUSE_VERSION_REQD}:../../emulators/suse91_aspell +DEPENDS_suse-9.1.base?= suse_base${_SUSE_VERSION_REQD}:../../emulators/suse91_base +DEPENDS_suse-9.1.compat?= suse_compat${_SUSE_VERSION_REQD}:../../emulators/suse91_compat +DEPENDS_suse-9.1.expat?= suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse91_expat +DEPENDS_suse-9.1.fontconfig?= suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse91_fontconfig +DEPENDS_suse-9.1.freetype2?= suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse91_freetype2 +DEPENDS_suse-9.1.gdk-pixbuf?= suse_gdk-pixbuf${_SUSE_VERSION_REQD}:../../emulators/suse91_gdk-pixbuf +DEPENDS_suse-9.1.glx?= suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse91_glx +DEPENDS_suse-9.1.gtk?= suse_gtk${_SUSE_VERSION_REQD}:../../emulators/suse91_gtk +DEPENDS_suse-9.1.gtk2?= suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse91_gtk2 +DEPENDS_suse-9.1.jpeg?= suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse91_libjpeg +DEPENDS_suse-9.1.locale?= suse_locale${_SUSE_VERSION_REQD}:../../emulators/suse91_locale +DEPENDS_suse-9.1.motif?= suse_openmotif${_SUSE_VERSION_REQD}:../../emulators/suse91_openmotif +DEPENDS_suse-9.1.png?= suse_libpng${_SUSE_VERSION_REQD}:../../emulators/suse91_libpng +DEPENDS_suse-9.1.slang?= suse_slang${_SUSE_VERSION_REQD}:../../emulators/suse91_slang +DEPENDS_suse-9.1.tiff?= suse_libtiff${_SUSE_VERSION_REQD}:../../emulators/suse91_libtiff +DEPENDS_suse-9.1.vmware?= suse_vmware${_SUSE_VERSION_REQD}:../../emulators/suse91_vmware +DEPENDS_suse-9.1.x11?= suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse91_x11 + +.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") +. for _mod_ in ${_LINUX_MODULES} +DEPENDS_suse-9.1.${_mod_}:= \ + ${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/} +. endfor +.endif diff --git a/emulators/suse91_linux/vars.mk b/emulators/suse91_linux/vars.mk deleted file mode 100644 index ffe221743bb..00000000000 --- a/emulators/suse91_linux/vars.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $ - -.ifndef SUSE_VARS_MK -SUSE_VARS_MK=1 - -SUSE_DIR_PREFIX= suse91 -SUSE_VERSION= 9.1 - -.endif # SUSE_VARS_MK diff --git a/emulators/suse91_locale/DESCR b/emulators/suse91_locale/DESCR index 25484919ed3..f5796d1ef9e 100644 --- a/emulators/suse91_locale/DESCR +++ b/emulators/suse91_locale/DESCR @@ -1,4 +1,5 @@ -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 includes the glibc locale files. +This package contains the glibc2 locale files. diff --git a/emulators/suse91_locale/Makefile b/emulators/suse91_locale/Makefile index b4eec1d142b..11e71b62a3c 100644 --- a/emulators/suse91_locale/Makefile +++ b/emulators/suse91_locale/Makefile @@ -1,26 +1,15 @@ -# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:18 jlam Exp $ -DISTNAME= suse_locale-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_locale-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Locale files for the Linux compatibility package +CONFLICTS= linux-locale-[0-9]* -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package with locale files -CONFLICTS= linux-locale-[0-9]* - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= base .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_locale/Makefile.i386 b/emulators/suse91_locale/Makefile.i386 deleted file mode 100644 index a67e5c40860..00000000000 --- a/emulators/suse91_locale/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= glibc-locale-2.3.3-98.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_locale/Makefile.x86_64 b/emulators/suse91_locale/Makefile.x86_64 deleted file mode 100644 index 74b54bd7525..00000000000 --- a/emulators/suse91_locale/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $ - -RPMFILES= glibc-locale-2.3.3-63.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_locale/suse.i386.mk b/emulators/suse91_locale/suse.i386.mk new file mode 100644 index 00000000000..9141531a928 --- /dev/null +++ b/emulators/suse91_locale/suse.i386.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:19 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES= glibc-locale-2.3.3-98.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_locale/suse.x86_64.mk b/emulators/suse91_locale/suse.x86_64.mk new file mode 100644 index 00000000000..e01fae4e13e --- /dev/null +++ b/emulators/suse91_locale/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:19 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES= glibc-locale-2.3.3-63.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_openmotif/DESCR b/emulators/suse91_openmotif/DESCR index f67dbf54135..a24d084b127 100644 --- a/emulators/suse91_openmotif/DESCR +++ b/emulators/suse91_openmotif/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 OpenMotif shared -libraries. +This package supports running ELF binaries linked with glibc2 that +require OpenMotif shared libraries. diff --git a/emulators/suse91_openmotif/Makefile b/emulators/suse91_openmotif/Makefile index a0a47fdcee8..becb35e457e 100644 --- a/emulators/suse91_openmotif/Makefile +++ b/emulators/suse91_openmotif/Makefile @@ -1,24 +1,13 @@ -# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:19 jlam Exp $ -DISTNAME= suse_openmotif-${SUSE_VERSION} -PKGREVISION= 4 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_openmotif-${SUSE_VERSION} +PKGREVISION= 5 +CATEGORIES= emulators -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for the Motif library +MAINTAINER= jdolecek@NetBSD.org +COMMENT= Linux compatibility package for OpenMotif -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +EMUL_MODULES.linux= x11 .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_openmotif/Makefile.i386 b/emulators/suse91_openmotif/Makefile.i386 deleted file mode 100644 index d12fe8a9ac3..00000000000 --- a/emulators/suse91_openmotif/Makefile.i386 +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $ - -RPMFILES= openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm \ - openmotif21-libs-2.1.30MLI4-119.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_openmotif/Makefile.x86_64 b/emulators/suse91_openmotif/Makefile.x86_64 deleted file mode 100644 index 9f2c4ec85f0..00000000000 --- a/emulators/suse91_openmotif/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $ - -RPMFILES= openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_openmotif/suse.i386.mk b/emulators/suse91_openmotif/suse.i386.mk new file mode 100644 index 00000000000..7ffbb858b19 --- /dev/null +++ b/emulators/suse91_openmotif/suse.i386.mk @@ -0,0 +1,5 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:20 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES+= openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm +DISTFILES+= openmotif21-libs-2.1.30MLI4-119.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_openmotif/suse.x86_64.mk b/emulators/suse91_openmotif/suse.x86_64.mk new file mode 100644 index 00000000000..d827c768d30 --- /dev/null +++ b/emulators/suse91_openmotif/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:20 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES= openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_slang/DESCR b/emulators/suse91_slang/DESCR index f9f21396127..f870b1b9b9f 100644 --- a/emulators/suse91_slang/DESCR +++ b/emulators/suse91_slang/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 -the "slang" library. +This package supports running ELF binaries linked with glibc2 that +require S-Lang shared libraries. diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile index 0201d77154d..62add579652 100644 --- a/emulators/suse91_slang/Makefile +++ b/emulators/suse91_slang/Makefile @@ -1,28 +1,20 @@ -# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:20 jlam Exp $ -DISTNAME= suse_slang-${SUSE_VERSION} -PKGREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_slang-${SUSE_VERSION} +PKGREVISION= 4 +CATEGORIES= emulators -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for slang library +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package for S-Lang -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base +EMUL_MODULES.linux= base -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif +# This symlink is managed by ldconfig(8). +CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1 post-install: - ${LN} -sf ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 \ - ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang.so.1 + cd ${EMULDIR}/usr/${LINUX_LIBSUBDIR} && \ + ${LN} -fs libslang-utf8.so.1 libslang.so.1 .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_slang/Makefile.i386 b/emulators/suse91_slang/Makefile.i386 deleted file mode 100644 index 4713c3d2436..00000000000 --- a/emulators/suse91_slang/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $ - -RPMFILES= slang-1.4.9-121.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_slang/Makefile.x86_64 b/emulators/suse91_slang/Makefile.x86_64 deleted file mode 100644 index e30fe9b0301..00000000000 --- a/emulators/suse91_slang/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $ - -RPMFILES= slang-1.4.9-112.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_slang/PLIST_rpmfix.i386 b/emulators/suse91_slang/PLIST_rpmfix.i386 deleted file mode 100644 index 4baff0be128..00000000000 --- a/emulators/suse91_slang/PLIST_rpmfix.i386 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST_rpmfix.i386,v 1.2 2006/05/28 17:41:18 rillig Exp $ -/usr/lib/libslang.so.1 diff --git a/emulators/suse91_slang/suse.i386.mk b/emulators/suse91_slang/suse.i386.mk new file mode 100644 index 00000000000..38aa10c7d41 --- /dev/null +++ b/emulators/suse91_slang/suse.i386.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:21 jlam Exp $ + +# SuSE i386 RPMs +DISTFILES= slang-1.4.9-121.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_slang/suse.x86_64.mk b/emulators/suse91_slang/suse.x86_64.mk new file mode 100644 index 00000000000..a5e1982486e --- /dev/null +++ b/emulators/suse91_slang/suse.x86_64.mk @@ -0,0 +1,4 @@ +# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:21 jlam Exp $ + +# SuSE x86_64 RPMs +DISTFILES= slang-1.4.9-112.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_vmware/DEINSTALL b/emulators/suse91_vmware/DEINSTALL new file mode 100644 index 00000000000..4b8b4b81dec --- /dev/null +++ b/emulators/suse91_vmware/DEINSTALL @@ -0,0 +1,9 @@ +# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:22 jlam Exp $ + +case "${STAGE}" in +DEINSTALL) + # Run any actions that require root privileges. + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1 + ;; +esac diff --git a/emulators/suse91_vmware/DESCR b/emulators/suse91_vmware/DESCR index 9777e703fdd..efff03682f1 100644 --- a/emulators/suse91_vmware/DESCR +++ b/emulators/suse91_vmware/DESCR @@ -1,4 +1,5 @@ -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 is supposed to help running VMware under NetBSD. +This package is a helper package for running VMware. diff --git a/emulators/suse91_vmware/INSTALL b/emulators/suse91_vmware/INSTALL new file mode 100644 index 00000000000..2ecaa0a2007 --- /dev/null +++ b/emulators/suse91_vmware/INSTALL @@ -0,0 +1,156 @@ +# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:22 jlam Exp $ + +# Generate a +ROOT_ACTIONS script that runs certain actions that require +# superuser privileges. +# +case "${STAGE},$1" in +UNPACK,|UNPACK,+ROOT_ACTIONS) + ${CAT} > ./+ROOT_ACTIONS << 'EOF' +#!@SH@ +# +# +ROOT_ACTIONS - run actions requiring superuser privileges +# +# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir] +# +# This script runs certain actions that require superuser privileges. +# If such privileges are not available, then simply output a message +# asking the user to run this script with the appropriate elevated +# privileges. +# +# Lines starting with "# SYMLINK: " are data read by this script that +# name the source paths and corresponding symlink that is managed by +# this script. If the symlink path is relative, then it is taken to be +# relative to ${PKG_PREFIX}. The source path is always unchanged. +# +# # SYMLINK: /dev/rcd0a ${EMULSUBDIR}/dev/cdrom +# + +CAT="@CAT@" +CHMOD="@CHMOD@" +ECHO="@ECHO@" +ID="@ID@" +LN="@LN@" +PWD_CMD="@PWD_CMD@" +RM="@RM@" +SED="@SED@" +TEST="@TEST@" + +SELF=$0 +ACTION=$1 + +CURDIR=`${PWD_CMD}` +PKG_METADATA_DIR="${2-${CURDIR}}" +: ${PKGNAME=${PKG_METADATA_DIR##*/}} +: ${PKG_PREFIX=@PREFIX@} + +ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done" +EUID=`${ID} -u` + +exitcode=0 +case $ACTION,$EUID in +ADD,0) + ${ECHO} "" > ${ROOT_ACTIONS_COOKIE} + ${CHMOD} g+w ${ROOT_ACTIONS_COOKIE} + ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} | + while read src dst; do + case $src in + "") continue ;; + esac + case $dst in + "") continue ;; + [!/]*) dst="${PKG_PREFIX}/$dst" ;; + esac + + if ${TEST} ! -e "$dst"; then + ${ECHO} "${PKGNAME}: linking $dst -> $src" + ${LN} -fs "$src" "$dst" + fi + done + ;; + +REMOVE,0) + ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} | + while read src dst; do + case $src in + "") continue ;; + esac + case $dst in + "") continue ;; + [!/]*) dst="${PKG_PREFIX}/$dst" ;; + esac + + if ${TEST} -e "$dst"; then + ${ECHO} "${PKGNAME}: removing $dst" + ${RM} -f "$dst" + fi + done + ${RM} -f ${ROOT_ACTIONS_COOKIE} + ;; + +ADD,*) + if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to complete +the installation of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} ADD + +============================================================================== +EOM + fi + ;; + +REMOVE,*) + if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then + ${CAT} << EOM +============================================================================== +Please run the following command with superuser privileges to begin the +removal of ${PKGNAME}: + + cd ${PKG_METADATA_DIR} && ${SELF} REMOVE + +Then, please run pkg_delete(1) again to complete the removal of this +package. + +============================================================================== +EOM + exitcode=1 + fi + ;; +esac +exit $exitcode + +EOF + ${SED} -n "/^\# SYMLINK: /p" ${SELF} >> ./+ROOT_ACTIONS + ${CHMOD} +x ./+ROOT_ACTIONS + ;; +esac + +# SYMLINK: /dev/rcd0a @EMULSUBDIR@/dev/cdrom +# SYMLINK: /dev/rfd0a @EMULSUBDIR@/dev/fd0 +# SYMLINK: /dev/wd0d @EMULSUBDIR@/dev/hda +# SYMLINK: /dev/wd1d @EMULSUBDIR@/dev/hdb +# SYMLINK: /dev/wd2d @EMULSUBDIR@/dev/hdc +# SYMLINK: /dev/wd3d @EMULSUBDIR@/dev/hdd +# SYMLINK: /dev/sd0d @EMULSUBDIR@/dev/hde +# SYMLINK: /dev/sd1d @EMULSUBDIR@/dev/hdf +# SYMLINK: /dev/sd2d @EMULSUBDIR@/dev/hdg +# SYMLINK: /dev/sd3d @EMULSUBDIR@/dev/hdh +# SYMLINK: /dev/sd4d @EMULSUBDIR@/dev/hdi +# SYMLINK: /dev/ttyE0 @EMULSUBDIR@/dev/tty1 +# SYMLINK: /dev/ttyE1 @EMULSUBDIR@/dev/tty2 +# SYMLINK: /dev/ttyE2 @EMULSUBDIR@/dev/tty3 +# SYMLINK: /dev/ttyE3 @EMULSUBDIR@/dev/tty4 +# SYMLINK: /dev/ttyE4 @EMULSUBDIR@/dev/tty5 +# SYMLINK: /dev/ttyE5 @EMULSUBDIR@/dev/tty6 +# SYMLINK: /dev/ttyE6 @EMULSUBDIR@/dev/tty7 +# SYMLINK: /dev/ttyE7 @EMULSUBDIR@/dev/tty8 +# SYMLINK: tty1 @EMULSUBDIR@/dev/tty0 + +case "${STAGE}" in +POST-INSTALL) + ${TEST} ! -x ./+ROOT_ACTIONS || + ./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR} + ;; +esac diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile index 3eec3dcfcf9..f19e5fdff55 100644 --- a/emulators/suse91_vmware/Makefile +++ b/emulators/suse91_vmware/Makefile @@ -1,36 +1,16 @@ -# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:28 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:22 jlam Exp $ -DISTNAME= suse_vmware-${SUSE_VERSION} -PKGREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_vmware-${SUSE_VERSION} +PKGREVISION= 3 +CATEGORIES= emulators +DISTFILES= grep-2.5.1-416.${SUSE_ARCH}.rpm -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package to support running VMware +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Linux compatibility package to help run VMware -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base -DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11 - -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} - -RPMFILES= grep-2.5.1-416.i586.rpm +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= base x11 RPMIGNOREPATH= usr -post-install: - @${GREP} -v '^#' ${FILESDIR}/device-links | \ - ${AWK} '{print("${LN} -fs "$$1" ${EMULDIR}/dev/"$$2)}' | \ - ${SH} - - @${GREP} -v '^#' ${FILESDIR}/device-links | \ - ${AWK} '{print("@exec ${LN} -fs "$$1" %D/${EMULSUBDIR}/dev/"$$2)}' \ - >>${PLIST_SRC} - @${GREP} -v '^#' ${FILESDIR}/device-links | \ - ${AWK} '{print("@unexec ${RM} -f %D/${EMULSUBDIR}/dev/"$$2)}' \ - >>${PLIST_SRC} - .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_vmware/PLIST b/emulators/suse91_vmware/PLIST deleted file mode 100644 index c5d7a7e8c18..00000000000 --- a/emulators/suse91_vmware/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2005/04/02 17:10:19 jdolecek Exp $ -@comment this plist intentionally left empty diff --git a/emulators/suse91_vmware/files/device-links b/emulators/suse91_vmware/files/device-links deleted file mode 100644 index 50b0788efdc..00000000000 --- a/emulators/suse91_vmware/files/device-links +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: device-links,v 1.1.1.1 2005/04/02 16:59:44 jdolecek Exp $ -/dev/rcd0a cdrom -/dev/rfd0a fd0 -/dev/wd0d hda -/dev/wd1d hdb -/dev/wd2d hdc -/dev/wd3d hdd -/dev/sd0d hde -/dev/sd1d hdf -/dev/sd2d hdg -/dev/sd3d hdh -/dev/sd4d hdi -/dev/ttyE0 tty1 -/dev/ttyE1 tty2 -/dev/ttyE2 tty3 -/dev/ttyE3 tty4 -/dev/ttyE4 tty5 -/dev/ttyE5 tty6 -/dev/ttyE6 tty7 -/dev/ttyE7 tty8 -tty1 tty0 diff --git a/emulators/suse91_x11/DESCR b/emulators/suse91_x11/DESCR index 023c56f39b1..9ce91f0841f 100644 --- a/emulators/suse91_x11/DESCR +++ b/emulators/suse91_x11/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 -X11 shared libraries. +This package supports running ELF binaries linked with glibc2 that +require X11 shared libraries. diff --git a/emulators/suse91_x11/Makefile b/emulators/suse91_x11/Makefile index 711ace7a801..be6cea81101 100644 --- a/emulators/suse91_x11/Makefile +++ b/emulators/suse91_x11/Makefile @@ -1,26 +1,29 @@ -# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $ +# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:23 jlam Exp $ -DISTNAME= suse_x11-${SUSE_VERSION} -PKGREVISION= 6 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUSE91} -DISTFILES= ${RPMFILES} +DISTNAME= suse_x11-${SUSE_VERSION} +PKGREVISION= 7 +CATEGORIES= emulators +DISTFILES= XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.suse.com/ -COMMENT= Linux compatibility package for X11 binaries +MAINTAINER= tron@NetBSD.org +COMMENT= Linux compatibility package for X11 -DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base +EMUL_MODULES.linux= base -EXTRACT_ONLY= # empty -NO_BUILD= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -.if exists(Makefile.${MACHINE_ARCH}) -.include "Makefile.${MACHINE_ARCH}" -.endif - -.include "../../mk/bsd.prefs.mk" +# These symlinks are managed by ldconfig(8). +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libFS.so.6 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libGLw.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libI810XvMC.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libVncExt.so.2 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXRes.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXfontcache.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXinerama.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXss.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXvMC.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libXxf86rush.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libfontenc.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libxkbfile.so.1 +CHECK_FILES_SKIP+= ${EMULDIR}/usr/X11R6/${LINUX_LIBSUBDIR}/libxkbui.so.1 .include "../../emulators/suse91_linux/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse91_x11/Makefile.i386 b/emulators/suse91_x11/Makefile.i386 deleted file mode 100644 index f9176057571..00000000000 --- a/emulators/suse91_x11/Makefile.i386 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $ - -RPMFILES= XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_x11/Makefile.x86_64 b/emulators/suse91_x11/Makefile.x86_64 deleted file mode 100644 index ec0ecd79c36..00000000000 --- a/emulators/suse91_x11/Makefile.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $ - -RPMFILES= XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_x11/PLIST_rpmfix.i386 b/emulators/suse91_x11/PLIST_rpmfix.i386 deleted file mode 100644 index 0aa20170dda..00000000000 --- a/emulators/suse91_x11/PLIST_rpmfix.i386 +++ /dev/null @@ -1,14 +0,0 @@ -@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 09:08:32 joerg Exp $ -/usr/X11R6/lib/libFS.so.6 -/usr/X11R6/lib/libGLw.so.1 -/usr/X11R6/lib/libI810XvMC.so.1 -/usr/X11R6/lib/libVncExt.so.2 -/usr/X11R6/lib/libXRes.so.1 -/usr/X11R6/lib/libXfontcache.so.1 -/usr/X11R6/lib/libXinerama.so.1 -/usr/X11R6/lib/libXss.so.1 -/usr/X11R6/lib/libXvMC.so.1 -/usr/X11R6/lib/libXxf86rush.so.1 -/usr/X11R6/lib/libfontenc.so.1 -/usr/X11R6/lib/libxkbfile.so.1 -/usr/X11R6/lib/libxkbui.so.1 diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application deleted file mode 100644 index 45a82846424..00000000000 --- a/emulators/suse_linux/Makefile.application +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile.application,v 1.24 2007/04/19 15:30:22 xtraeme Exp $ - -.include "../../mk/bsd.prefs.mk" - -.if (${OPSYS} == "NetBSD" || \ - ${OPSYS} == "FreeBSD" || \ - ${OPSYS} == "DragonFly") \ - && (${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "x86_64") - -. if !empty(SUSE_PREFER:M10.0) -. include "../../emulators/suse100_linux/vars.mk" -. elif !empty(SUSE_PREFER:M9.1) && (${MACHINE_ARCH} != "powerpc") -. include "../../emulators/suse91_linux/vars.mk" -. else -. include "../../emulators/suse_linux/unavailable.mk" -. endif - -. if defined(RPMFILES) || defined(SUSE_COMPAT32) -. include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common" -. endif - -EMULSUBDIR?= emul/linux -EMULDIR?= ${PREFIX}/${EMULSUBDIR} -LDD= ${EMULDIR}/usr/bin/ldd -.elif ${OPSYS} == "Linux" -# No Linux emulation is needed -USE_NATIVE_LINUX= # empty -.else -. include "../../emulators/suse_linux/unavailable.mk" -.endif diff --git a/emulators/suse_linux/PLIST_dynamic b/emulators/suse_linux/PLIST_dynamic deleted file mode 100644 index 596e633957a..00000000000 --- a/emulators/suse_linux/PLIST_dynamic +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST_dynamic,v 1.2 2006/06/26 17:54:20 salo Exp $ -@comment PLIST created dynamically diff --git a/emulators/suse_linux/unavailable.mk b/emulators/suse_linux/unavailable.mk deleted file mode 100644 index 3bf272f3610..00000000000 --- a/emulators/suse_linux/unavailable.mk +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: unavailable.mk,v 1.2 2006/07/28 22:57:38 kristerw Exp $ - -.ifndef SUSE_UNAVAILABLE_MK -SUSE_UNAVAILABLE_MK=1 - -# We put a value here so that the creation of the bulk build cache files -# works correctly on all machines. This speeds up the marking of all -# COMPAT_LINUX packages as not available. -# -SUSE_DIR_PREFIX= suse100 -SUSE_VERSION= 0 -PKG_SKIP_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}" - -# By default, we can't check for missing shared libraries nor note which -# shared libraries are provided and/or required by the package since the -# library support is via syscall emulation. -# -CHECK_SHLIBS_SUPPORTED?= no - -.endif # SUSE_UNAVAILABLE_MK diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile index af49dc32bb1..0cf0eb77da0 100644 --- a/emulators/vmware/Makefile +++ b/emulators/vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/03/21 16:15:58 tron Exp $ +# $NetBSD: Makefile,v 1.19 2007/07/29 05:19:24 jlam Exp $ DISTNAME= VMware-2.0.4-1142 PKGNAME= vmware-2.0.4 @@ -17,16 +17,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.vmware.com/ COMMENT= VMware 2.x emulator -CONFLICTS= vmware-3* - DEPENDS+= vmware-module-1.*:../../emulators/vmware-module -DEPENDS+= suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware LICENSE= vmware-license -WRKSRC= ${WRKDIR}/vmware-distrib +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= vmware -ONLY_FOR_PLATFORM= NetBSD-*-i386 +WRKSRC= ${WRKDIR}/vmware-distrib # We could install it into /etc/vmware, but that would mean we install # it somewhere out of ${PREFIX}, which is not a good idea, and the linux @@ -82,5 +80,4 @@ post-install: ${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\""; \ ) > ${VMWARE_CFG_DIR}/config -.include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 877e59af40d..389378064e8 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/03/25 14:45:19 tron Exp $ +# $NetBSD: Makefile,v 1.21 2007/07/29 05:19:25 jlam Exp $ DISTNAME= VMware-workstation-3.2.1-2242 PKGNAME= vmware-3.2.1pl1 @@ -10,12 +10,6 @@ MASTER_SITES= http://download3.vmware.com/software/wkst/ \ http://vmware-heva.www.conxion.com/software/ \ ftp://mirror.aarnet.edu.au/pub/vmware/software/ -MAINTAINER= jdolecek@NetBSD.org -HOMEPAGE= http://www.vmware.com/ -COMMENT= VMware emulator 3.x - -CONFLICTS= vmware-2.* - # Binary patch to fix an problem with the nice(3) interface in an # newer glibc (>= v2.3.3) VMWARE_BIN_PATCH= vmware-any-any-update99 @@ -24,16 +18,22 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${VMWARE_BIN_PATCH}.tar.gz SITES.${VMWARE_BIN_PATCH}.tar.gz= ftp://ftp.cvut.cz/vmware/obsolete/ +MAINTAINER= jdolecek@NetBSD.org +HOMEPAGE= http://www.vmware.com/ +COMMENT= VMware emulator 3.x + DEPENDS+= vmware-module>=3.2.1.8:../../emulators/vmware-module3 -DEPENDS+= suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware LICENSE= vmware-license -WRKSRC= ${WRKDIR}/vmware-distrib +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= vmware +SUSE_VERSION_REQD= 6.4nb1 + +WRKSRC= ${WRKDIR}/vmware-distrib -ONLY_FOR_PLATFORM= NetBSD-*-i386 # There is a kernel bug in NetBSD 3.0 for vmware. -NOT_FOR_PLATFORM= NetBSD-3.0*-i386 +NOT_FOR_PLATFORM= NetBSD-3.0*-* NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} @@ -46,8 +46,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED} # so use this way. VMWARE_CFG_DIR= ${PREFIX}/emul/linux/etc/vmware -.include "../../mk/bsd.prefs.mk" - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: @@ -110,5 +108,4 @@ post-install: ${ECHO} "xkeymap.usekeycodeMapIfXFree86 = true"; \ ) > ${VMWARE_CFG_DIR}/config -.include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile index 1be1ea8ae9e..4dcf21d8a25 100644 --- a/emulators/xyame/Makefile +++ b/emulators/xyame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:53 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:25 jlam Exp $ # DISTNAME= xyame038 @@ -11,17 +11,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.geocities.co.jp/Stylish/2068/yame.html COMMENT= Multi-system emulator (Gameboy, NES, and PC-Engine) -.include "../../emulators/suse_linux/Makefile.application" +EMUL_PLATFORMS= linux-i386 +EMUL_MODULES.linux= x11 -.if !defined(USE_NATIVE_LINUX) -DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif +WRKSRC= ${WRKDIR} +BUILD_DIRS= # empty -WRKSRC= ${WRKDIR} -NO_CONFIGURE= yes -NO_BUILD= yes - -ONLY_FOR_PLATFORM+= *-*-i386 INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: |