pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Add support for using suse100 with NetBSD/amd64 and CO...
details: https://anonhg.NetBSD.org/pkgsrc/rev/862ab38ac871
branches: trunk
changeset: 528029:862ab38ac871
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Apr 19 15:30:20 2007 +0000
description:
Add support for using suse100 with NetBSD/amd64 and COMPAT_LINUX32.
Support is added via the options framework, to use 32-bit packages
must be used "PKG_OPTIONS.suse=compat32", otherwise it will use
the 64-bit packages by default.
Known packages working are opera (does not require any change in Makefile)
and rar-bin.
Tested by some, closes PR pkg/35477 by Michai Chelaru (which provided
a patch more or less than this one).
diffstat:
archivers/rar-bin/Makefile | 5 +-
emulators/suse100_aspell/Makefile | 6 +--
emulators/suse100_base/INSTALL | 4 +-
emulators/suse100_base/Makefile | 18 +++++------
emulators/suse100_base/PLIST | 4 +-
emulators/suse100_compat/Makefile | 6 +--
emulators/suse100_expat/Makefile | 6 +--
emulators/suse100_fontconfig/Makefile | 6 +--
emulators/suse100_freetype2/Makefile | 6 +--
emulators/suse100_gdk-pixbuf/Makefile | 6 +--
emulators/suse100_glx/Makefile | 6 +--
emulators/suse100_gtk/Makefile | 6 +--
emulators/suse100_gtk2/Makefile | 8 +---
emulators/suse100_libcups/Makefile | 6 +--
emulators/suse100_libjpeg/Makefile | 6 +--
emulators/suse100_libpng/Makefile | 6 +--
emulators/suse100_libtiff/Makefile | 6 +--
emulators/suse100_libxml2/Makefile | 6 +--
emulators/suse100_linux/Makefile.common | 47 +++++++++++++++++++++++-------
emulators/suse100_locale/Makefile | 6 +--
emulators/suse100_openmotif/Makefile | 6 +--
emulators/suse100_openssl/Makefile | 6 +--
emulators/suse100_slang/Makefile | 8 +---
emulators/suse100_x11/Makefile | 8 +---
emulators/suse_linux/Makefile.application | 4 +-
meta-pkgs/suse100/Makefile | 3 +-
26 files changed, 93 insertions(+), 112 deletions(-)
diffs (truncated from 631 to 300 lines):
diff -r 9a58a9e3bbe1 -r 862ab38ac871 archivers/rar-bin/Makefile
--- a/archivers/rar-bin/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/archivers/rar-bin/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/10/19 21:32:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:22 xtraeme Exp $
#
DISTNAME= rarlinux-3.6.0
@@ -19,7 +19,7 @@
# old name of the package
CONFLICTS= rarlinux-[0-9]* rar-linux-[0-9]*
-.include "../../emulators/suse_linux/Makefile.application"
+SUSE_COMPAT32= yes
.if !defined(USE_NATIVE_LINUX)
DEPENDS+= suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
@@ -39,4 +39,5 @@
${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/rar-bin
${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${PREFIX}/share/doc/rar-bin
+.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_aspell/Makefile
--- a/emulators/suse100_aspell/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_aspell/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_aspell-${SUSE_VERSION}
PKGREVISION= 1
@@ -18,9 +18,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_base/INSTALL
--- a/emulators/suse100_base/INSTALL Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_base/INSTALL Thu Apr 19 15:30:20 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2007/04/19 15:30:20 xtraeme Exp $
case "${STAGE}" in
POST-INSTALL)
- emulsubdir=linux
+ emulsubdir="@OPSYS_EMULSUBDIR@"
emuldir="@OPSYS_EMULDIR@"
pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_base/Makefile
--- a/emulators/suse100_base/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_base/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/03/02 10:35:04 sketch Exp $
+# $NetBSD: Makefile,v 1.9 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 3
@@ -18,11 +18,10 @@
EXTRACT_ONLY= # empty
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q} \
+ SUSE_COMPAT32_SUFFIX=${SUSE_COMPAT32_SUFFIX:Q}
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+.include "../../mk/bsd.prefs.mk"
RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \
./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
@@ -34,9 +33,9 @@
LINUX_LDD= ${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
LINUX_LIB?= lib
-.include "../../mk/bsd.prefs.mk"
+INSTALLATION_DIRS= sbin
-INSTALLATION_DIRS= sbin
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
do-build:
@for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \
@@ -49,9 +48,8 @@
done
do-install:
- for FILE in ${WRKDIR}/*.sh; do \
- ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
- done
+ ${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 \
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_base/PLIST
--- a/emulators/suse100_base/PLIST Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_base/PLIST Thu Apr 19 15:30:20 2007 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:34:10 tonio Exp $
-sbin/linux-mkpwd
+@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
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_compat/Makefile
--- a/emulators/suse100_compat/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_compat/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/03/24 21:52:04 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_compat-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_expat/Makefile
--- a/emulators/suse100_expat/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_expat/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_expat-${SUSE_VERSION}
PKGREVISION= 1
@@ -17,9 +17,7 @@
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_fontconfig/Makefile
--- a/emulators/suse100_fontconfig/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_fontconfig/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_fontconfig-${SUSE_VERSION}
PKGREVISION= 2
@@ -17,9 +17,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_freetype2/Makefile
--- a/emulators/suse100_freetype2/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_freetype2/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/19 15:30:20 xtraeme Exp $
DISTNAME= suse_freetype2-${SUSE_VERSION}
PKGREVISION= 3
@@ -16,9 +16,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_gdk-pixbuf/Makefile
--- a/emulators/suse100_gdk-pixbuf/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_gdk-pixbuf/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_glx/Makefile
--- a/emulators/suse100_glx/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_glx/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_glx-${SUSE_VERSION}
PKGREVISION= 2
@@ -17,9 +17,7 @@
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_gtk/Makefile
--- a/emulators/suse100_gtk/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_gtk/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_gtk-${SUSE_VERSION}
PKGREVISION= 1
@@ -16,9 +16,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_gtk2/Makefile
--- a/emulators/suse100_gtk2/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_gtk2/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/24 21:52:51 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_gtk2-${SUSE_VERSION}
PKGREVISION= 3
@@ -26,11 +26,7 @@
FILES_SUBST+= BINSUFFIX=${BINSUFFIX:Q}
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-.include "../../mk/bsd.prefs.mk"
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_libcups/Makefile
--- a/emulators/suse100_libcups/Makefile Thu Apr 19 15:00:45 2007 +0000
+++ b/emulators/suse100_libcups/Makefile Thu Apr 19 15:30:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/03/24 21:52:51 salo Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
DISTNAME= suse_libcups-${SUSE_VERSION}
PKGREVISION= 2
@@ -16,9 +16,7 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+SUSE_INCLUDE_MAKEFILE_ARCH= yes
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 9a58a9e3bbe1 -r 862ab38ac871 emulators/suse100_libjpeg/Makefile
Home |
Main Index |
Thread Index |
Old Index