Subject: pkg/35477: SuSE100 linux32 compat packages for NetBSD x86_64
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <kefren@netbsd.ro>
List: pkgsrc-bugs
Date: 01/24/2007 21:05:00
>Number: 35477
>Category: pkg
>Synopsis: SuSE100 linux32 compat packages for NetBSD x86_64
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Jan 24 21:05:00 +0000 2007
>Originator: Mihai Chelaru
>Release: NetBSD 4.0_BETA2
>Organization:
>Environment:
System: NetBSD kefren64.netbsd.ro 4.0_BETA2 NetBSD 4.0_BETA2 (Kefren.MPACPI) #3: Wed Jan 24 11:46:18 EET 2007 root@kefren64.netbsd.ro:/disk2/src/sys/arch/amd64/compile/Kefren.MPACPI amd64
Architecture: x86_64
Machine: amd64
>Description:
Changes required to install 32 bits SuSE packages on NetBSD/amd64 and use linux32 emulation.
Probably comment variable need to be fixed. Also I'm not very happy with variables' names.
Also included www/opera/Makefile patch as an example
Maybe this will hurry linux32 fixes ;)
>How-To-Repeat:
cd meta-pkgs/suse100 && make PKG_OPTIONS.suse=32bits install
>Fix:
Index: emulators/suse100_aspell/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_aspell/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse100_aspell/Makefile 30 Jun 2006 16:20:23 -0000 1.2
+++ emulators/suse100_aspell/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_aspell-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}aspell-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,18 +10,18 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for Aspell library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for Aspell library
.if !defined(USE_NATIVE_LINUX)
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
.endif
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_base/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- emulators/suse100_base/Makefile 19 Sep 2006 19:58:46 -0000 1.6
+++ emulators/suse100_base/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.6 2006/09/19 19:58:46 joerg Exp $
-DISTNAME= suse_base-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}
PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,7 +10,7 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package
CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
@@ -20,8 +22,8 @@
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \
Index: emulators/suse100_compat/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_compat/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse100_compat/Makefile 30 Jun 2006 16:20:23 -0000 1.4
+++ emulators/suse100_compat/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_compat-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}compat-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package with old shared libraries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package with old shared libraries
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_expat/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_expat/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_expat/Makefile 30 Jun 2006 16:20:23 -0000 1.3
+++ emulators/suse100_expat/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_expat-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}expat-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,17 +10,17 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for expat binaries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for expat binaries
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_fontconfig/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_fontconfig/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse100_fontconfig/Makefile 30 Jun 2006 16:20:23 -0000 1.4
+++ emulators/suse100_fontconfig/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_fontconfig-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}fontconfig-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,17 +10,17 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for fontconfig binaries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for fontconfig binaries
-DEPENDS+= suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse100_expat
-DEPENDS+= suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}expat-${SUSE_VERSION}{,nb*}:../../emulators/suse100_expat
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_freetype2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_freetype2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- emulators/suse100_freetype2/Makefile 2 Aug 2006 14:26:13 -0000 1.5
+++ emulators/suse100_freetype2/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
-DISTNAME= suse_freetype2-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}freetype2-${SUSE_VERSION}
PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for FreeType2 library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for FreeType2 library
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_gdk-pixbuf/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_gdk-pixbuf/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_gdk-pixbuf/Makefile 30 Jun 2006 16:20:23 -0000 1.3
+++ emulators/suse100_gdk-pixbuf/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}gdk-pixbuf-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for gdk-pixbuf binaries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for gdk-pixbuf binaries
-DEPENDS+= suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse100_gtk
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse100_gtk
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_glx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_glx/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_glx/Makefile 30 Jun 2006 16:20:23 -0000 1.3
+++ emulators/suse100_glx/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_glx-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}glx-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,17 +10,17 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the GL library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the GL library
-DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
EXTRACT_ONLY= # empty
NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_gtk/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse100_gtk/Makefile 30 Jun 2006 16:20:23 -0000 1.2
+++ emulators/suse100_gtk/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_gtk-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}gtk-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for GTK binaries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for GTK binaries
-DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_gtk2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_gtk2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- emulators/suse100_gtk2/Makefile 30 Jun 2006 16:20:23 -0000 1.5
+++ emulators/suse100_gtk2/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.5 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_gtk2-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}gtk2-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,14 +10,14 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for GTK2 binaries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for GTK2 binaries
-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
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse100_fontconfig
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libpng
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libtiff
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
EXTRACT_ONLY= # empty
NO_BUILD= YES
@@ -25,8 +27,8 @@
FILES_SUBST+= EMULDIR=${EMULDIR:Q}
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_libcups/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_libcups/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse100_libcups/Makefile 30 Jun 2006 16:20:23 -0000 1.2
+++ emulators/suse100_libcups/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_libcups-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}libcups-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the Cups library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the Cups library
-DEPENDS+= suse_openssl-${SUSE_VERSION}{,nb*}:../../emulators/suse100_openssl
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}openssl-${SUSE_VERSION}{,nb*}:../../emulators/suse100_openssl
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_libjpeg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_libjpeg/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_libjpeg/Makefile 30 Jun 2006 16:20:23 -0000 1.3
+++ emulators/suse100_libjpeg/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_libjpeg-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}libjpeg-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,17 +10,17 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the JPEG library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the JPEG library
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_libpng/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_libpng/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse100_libpng/Makefile 6 Dec 2006 10:35:58 -0000 1.4
+++ emulators/suse100_libpng/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.4 2006/12/06 10:35:58 wiz Exp $
-DISTNAME= suse_libpng-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}libpng-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the PNG library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the PNG library
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_libtiff/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_libtiff/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- emulators/suse100_libtiff/Makefile 2 Aug 2006 14:26:13 -0000 1.5
+++ emulators/suse100_libtiff/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
-DISTNAME= suse_libtiff-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}libtiff-${SUSE_VERSION}
PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the TIFF library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the TIFF library
-DEPENDS+= suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_libxml2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_libxml2/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse100_libxml2/Makefile 30 Jun 2006 16:20:23 -0000 1.2
+++ emulators/suse100_libxml2/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_libxml2-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}libxml2-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the libxml2 library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the libxml2 library
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_linux/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_linux/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- emulators/suse100_linux/Makefile.common 2 Oct 2006 16:00:38 -0000 1.12
+++ emulators/suse100_linux/Makefile.common 24 Jan 2007 19:47:56 -0000
@@ -3,10 +3,14 @@
.include "../../emulators/suse100_linux/vars.mk"
.include "../../emulators/suse100_linux/arch.mk"
+.if empty(PKG_OPTIONS:M32bits)
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
+.else
+ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 NetBSD-[4-9]*-x86_64
+.endif
_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}/
@@ -32,7 +36,7 @@
# Don't check any script interpreter, as long as nobody complains.
CHECK_INTERPRETER_SKIP= *
-EMULSUBDIR= emul/linux
+EMULSUBDIR= emul/linux${SUSE_BIT_SUFFIX}
EMULDIR= ${PREFIX}/${EMULSUBDIR}
# Set location of OPSYS-specific emulation directory
Index: emulators/suse100_linux/arch.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_linux/arch.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 arch.mk
--- emulators/suse100_linux/arch.mk 9 Mar 2006 20:33:46 -0000 1.1.1.1
+++ emulators/suse100_linux/arch.mk 24 Jan 2007 19:47:56 -0000
@@ -5,7 +5,10 @@
.include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH} == "i386"
+.if !empty(PKG_OPTIONS:M32bits)
+SUSE_ARCH?= i586
+SUSE_ARCH_DIR?= i386
+.elif ${MACHINE_ARCH} == "i386"
SUSE_ARCH?= i586
SUSE_ARCH_DIR?= ${MACHINE_ARCH}
.elif ${MACHINE_ARCH} == "powerpc"
Index: emulators/suse100_linux/options.mk
===================================================================
RCS file: emulators/suse100_linux/options.mk
diff -N emulators/suse100_linux/options.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ emulators/suse100_linux/options.mk 24 Jan 2007 19:47:56 -0000
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.suse
+PKG_SUPPORTED_OPTIONS= 32bits
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:M32bits)
+SUSE_BIT_DISTNAME=32b_
+SUSE_BIT_COMMENT=32 bits
+SUSE_BIT_INCLUDE=i386
+SUSE_BIT_SUFFIX=32
+.else
+SUSE_BIT_INCLUDE=${MACHINE_ARCH}
+.endif
+
Index: emulators/suse100_locale/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_locale/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_locale/Makefile 30 Jun 2006 16:20:23 -0000 1.3
+++ emulators/suse100_locale/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_locale-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}locale-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,9 +10,9 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Locale files for the Linux compatibility package
+COMMENT= Locale files for the Linux ${SUSE_BIT_COMMENT} compatibility package
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
CONFLICTS= linux-locale-[0-9]*
@@ -18,8 +20,8 @@
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_openmotif/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_openmotif/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/suse100_openmotif/Makefile 30 Jun 2006 16:20:23 -0000 1.2
+++ emulators/suse100_openmotif/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-DISTNAME= suse_openmotif-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}openmotif-${SUSE_VERSION}
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the Motif library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the Motif library
-DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_openssl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_openssl/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_openssl/Makefile 28 Sep 2006 01:05:33 -0000 1.3
+++ emulators/suse100_openssl/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/09/28 01:05:33 salo Exp $
-DISTNAME= suse_openssl-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}openssl-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for the OpenSSL library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for the OpenSSL library
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../emulators/suse100_linux/Makefile.common"
Index: emulators/suse100_slang/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_slang/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/suse100_slang/Makefile 30 Jun 2006 16:20:24 -0000 1.3
+++ emulators/suse100_slang/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:24 salo Exp $
-DISTNAME= suse_slang-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}slang-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,17 +10,17 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for slang library
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for slang library
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
post-install:
Index: emulators/suse100_x11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_x11/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- emulators/suse100_x11/Makefile 30 Jun 2006 16:20:24 -0000 1.4
+++ emulators/suse100_x11/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:24 salo Exp $
-DISTNAME= suse_x11-${SUSE_VERSION}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}x11-${SUSE_VERSION}
PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE100}
@@ -8,16 +10,16 @@
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.suse.com/
-COMMENT= Linux compatibility package for X11 binaries
+COMMENT= Linux ${SUSE_BIT_COMMENT} compatibility package for X11 binaries
-DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_BIT_INCLUDE})
+.include "Makefile.${SUSE_BIT_INCLUDE}"
.endif
.include "../../mk/bsd.prefs.mk"
Index: emulators/suse_linux/Makefile.application
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse_linux/Makefile.application,v
retrieving revision 1.23
diff -u -r1.23 Makefile.application
--- emulators/suse_linux/Makefile.application 26 Jun 2006 19:24:05 -0000 1.23
+++ emulators/suse_linux/Makefile.application 24 Jan 2007 19:47:56 -0000
@@ -2,7 +2,9 @@
.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "NetBSD" || \
+.if ((${MACHINE_ARCH} == "x86_64") && (!empty(PKG_OPTIONS:M32bits)))
+. include "../../emulators/suse100_linux/Makefile.common"
+.elif (${OPSYS} == "NetBSD" || \
${OPSYS} == "FreeBSD" || \
${OPSYS} == "DragonFly") \
&& (${MACHINE_ARCH} == "i386" || \
Index: meta-pkgs/suse100/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/suse100/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- meta-pkgs/suse100/Makefile 30 Jun 2006 16:20:41 -0000 1.5
+++ meta-pkgs/suse100/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,37 +1,39 @@
# $NetBSD: Makefile,v 1.5 2006/06/30 16:20:41 salo Exp $
#
-DISTNAME= suse-10.0
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= suse_${SUSE_BIT_DISTNAME}linux-10.0
PKGREVISION= 3
CATEGORIES= meta-pkgs emulators
MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= SUSE-based Linux binary emulation environment
+COMMENT= SUSE-based Linux ${SUSE_BIT_COMMENT} binary emulation environment
# This list should contain all suse100_* packages.
#
-DEPENDS+= suse_base-10.0{,nb*}:../../emulators/suse100_base
-DEPENDS+= suse_aspell-10.0{,nb*}:../../emulators/suse100_aspell
-DEPENDS+= suse_compat-10.0{,nb*}:../../emulators/suse100_compat
-DEPENDS+= suse_expat-10.0{,nb*}:../../emulators/suse100_expat
-DEPENDS+= suse_fontconfig-10.0{,nb*}:../../emulators/suse100_fontconfig
-DEPENDS+= suse_freetype2-10.0{,nb*}:../../emulators/suse100_freetype2
-DEPENDS+= suse_gdk-pixbuf-10.0{,nb*}:../../emulators/suse100_gdk-pixbuf
-DEPENDS+= suse_glx-10.0{,nb*}:../../emulators/suse100_glx
-DEPENDS+= suse_gtk2-10.0{,nb*}:../../emulators/suse100_gtk2
-DEPENDS+= suse_gtk-10.0{,nb*}:../../emulators/suse100_gtk
-DEPENDS+= suse_libcups-10.0{,nb*}:../../emulators/suse100_libcups
-DEPENDS+= suse_libjpeg-10.0{,nb*}:../../emulators/suse100_libjpeg
-DEPENDS+= suse_libpng-10.0{,nb*}:../../emulators/suse100_libpng
-DEPENDS+= suse_libtiff-10.0{,nb*}:../../emulators/suse100_libtiff
-DEPENDS+= suse_libxml2-10.0{,nb*}:../../emulators/suse100_libxml2
-DEPENDS+= suse_locale-10.0{,nb*}:../../emulators/suse100_locale
-DEPENDS+= suse_openmotif-10.0{,nb*}:../../emulators/suse100_openmotif
-DEPENDS+= suse_openssl-10.0{,nb*}:../../emulators/suse100_openssl
-DEPENDS+= suse_slang-10.0{,nb*}:../../emulators/suse100_slang
-DEPENDS+= suse_x11-10.0{,nb*}:../../emulators/suse100_x11
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}base-10.0{,nb*}:../../emulators/suse100_base
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}aspell-10.0{,nb*}:../../emulators/suse100_aspell
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}compat-10.0{,nb*}:../../emulators/suse100_compat
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}expat-10.0{,nb*}:../../emulators/suse100_expat
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}fontconfig-10.0{,nb*}:../../emulators/suse100_fontconfig
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}freetype2-10.0{,nb*}:../../emulators/suse100_freetype2
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}gdk-pixbuf-10.0{,nb*}:../../emulators/suse100_gdk-pixbuf
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}glx-10.0{,nb*}:../../emulators/suse100_glx
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}gtk2-10.0{,nb*}:../../emulators/suse100_gtk2
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}gtk-10.0{,nb*}:../../emulators/suse100_gtk
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libcups-10.0{,nb*}:../../emulators/suse100_libcups
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libjpeg-10.0{,nb*}:../../emulators/suse100_libjpeg
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libpng-10.0{,nb*}:../../emulators/suse100_libpng
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libtiff-10.0{,nb*}:../../emulators/suse100_libtiff
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}libxml2-10.0{,nb*}:../../emulators/suse100_libxml2
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}locale-10.0{,nb*}:../../emulators/suse100_locale
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}openmotif-10.0{,nb*}:../../emulators/suse100_openmotif
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}openssl-10.0{,nb*}:../../emulators/suse100_openssl
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}slang-10.0{,nb*}:../../emulators/suse100_slang
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}x11-10.0{,nb*}:../../emulators/suse100_x11
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
Index: www/opera/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/opera/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- www/opera/Makefile 22 Jan 2007 14:05:35 -0000 1.63
+++ www/opera/Makefile 24 Jan 2007 19:47:56 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.63 2007/01/22 14:05:35 dmcmahill Exp $
-DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/}
+.include "../../emulators/suse100_linux/options.mk"
+
+DISTNAME= opera-${SUSE_BIT_DISTNAME}${OPERA_PKG_VERSION:S/u/pl/}
CATEGORIES= www
MASTER_SITES= ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/
MASTER_SITES+= http://ftp.sunet.se/pub/www/clients/Opera/${OPERA_DIR}/
@@ -14,7 +16,8 @@
HOMEPAGE= http://www.opera.com/
COMMENT= Small, fast and customizable WWW client
-ONLY_FOR_PLATFORM= NetBSD-*-i386 SunOS-*-sparc FreeBSD-*-i386 DragonFly-*-i386
+ONLY_FOR_PLATFORM= NetBSD-*-i386 SunOS-*-sparc FreeBSD-*-i386 DragonFly-*-i386\
+ NetBSD-*-x86_64
LICENSE= opera-850-license
@@ -34,7 +37,7 @@
_OPERA_MACHINE_ARCH?= ${MACHINE_ARCH}
.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly)
-DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_${SUSE_BIT_DISTNAME}x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
# we need the DIST_SUBDIR=. because of the inclusion of suse's Makefile.common
DIST_SUBDIR= .
>Unformatted: