pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Add support to install on NetBSD/amd64 and SUSE_COMPAT32.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3db104289fe0
branches:  trunk
changeset: 528031:3db104289fe0
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Apr 19 16:11:34 2007 +0000

description:
Add support to install on NetBSD/amd64 and SUSE_COMPAT32.

Do not work yet, but that will help people to test and fix COMPAT_LINUX32.

diffstat:

 multimedia/libflashsupport/Makefile |  11 +++++++----
 multimedia/libflashsupport/PLIST    |   4 ++--
 multimedia/ns-flash/Makefile        |  10 +++++-----
 www/nspluginwrapper/Makefile        |   4 ++--
 www/opera-plugins/Makefile          |   4 +++-
 5 files changed, 19 insertions(+), 14 deletions(-)

diffs (110 lines):

diff -r e72013adfacd -r 3db104289fe0 multimedia/libflashsupport/Makefile
--- a/multimedia/libflashsupport/Makefile       Thu Apr 19 15:31:07 2007 +0000
+++ b/multimedia/libflashsupport/Makefile       Thu Apr 19 16:11:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/04/12 08:24:38 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 16:11:35 xtraeme Exp $
 #
 
 PKGNAME=       libflashsupport-1.0.2098
@@ -18,7 +18,7 @@
 RPM2PKG=        ${PREFIX}/sbin/rpm2pkg
 RPM2PKGARGS=   -d ${WRKDIR} -s 3 ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 
-.include "../../emulators/suse_linux/Makefile.application"
+SUSE_COMPAT32= yes
 
 .if !defined(USE_NATIVE_LINUX)
 DEPENDS+=              suse_base>=9.1:../../emulators/${SUSE_DIR_PREFIX}_base
@@ -33,7 +33,10 @@
        ${RPM2PKG} ${RPM2PKGARGS}
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/libflashsupport.so ${PREFIX}/emul/linux/usr/lib
-       ${INSTALL_DATA} ${WRKDIR}/doc/libflashsupport-1.0/README ${PREFIX}/share/doc/libflashsupport.README
+       ${INSTALL_LIB} ${WRKDIR}/libflashsupport.so \
+               ${PREFIX}/${EMULSUBDIR}/usr/lib
+       ${INSTALL_DATA} ${WRKDIR}/doc/libflashsupport-1.0/README \
+               ${PREFIX}/share/doc/libflashsupport.README
 
+.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff -r e72013adfacd -r 3db104289fe0 multimedia/libflashsupport/PLIST
--- a/multimedia/libflashsupport/PLIST  Thu Apr 19 15:31:07 2007 +0000
+++ b/multimedia/libflashsupport/PLIST  Thu Apr 19 16:11:34 2007 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/22 21:46:44 abs Exp $
-emul/linux/usr/lib/libflashsupport.so
+@comment $NetBSD: PLIST,v 1.2 2007/04/19 16:11:35 xtraeme Exp $
+${OPSYS_EMULDIR}/usr/lib/libflashsupport.so
 share/doc/libflashsupport.README
diff -r e72013adfacd -r 3db104289fe0 multimedia/ns-flash/Makefile
--- a/multimedia/ns-flash/Makefile      Thu Apr 19 15:31:07 2007 +0000
+++ b/multimedia/ns-flash/Makefile      Thu Apr 19 16:11:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/03/23 22:59:16 abs Exp $
+# $NetBSD: Makefile,v 1.22 2007/04/19 16:11:34 xtraeme Exp $
 
 CATEGORIES=            multimedia www
 PKGREVISION=           2
@@ -14,9 +14,11 @@
 WRKSRC=                        ${WRKDIR}/${WRKNAME}
 DIST_SUBDIR=           flash/${FLASH_VERS}
 
+SUSE_COMPAT32=         yes
+SUSE_COMPAT32_OPT=     yes
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 FLASH_VERS=            9.0r31
 DEPENDS+=              suse_compat>=9.0:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=              suse_x11>=9.0:../../emulators/${SUSE_DIR_PREFIX}_x11
@@ -58,10 +60,8 @@
        ${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
        ${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
-.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
-
 .if ${OPSYS} != "SunOS"
-.include "../../emulators/suse_linux/Makefile.application"
+.  include "../../emulators/suse_linux/Makefile.application"
 .endif
 .include "../../mk/bsd.pkg.mk"
diff -r e72013adfacd -r 3db104289fe0 www/nspluginwrapper/Makefile
--- a/www/nspluginwrapper/Makefile      Thu Apr 19 15:31:07 2007 +0000
+++ b/www/nspluginwrapper/Makefile      Thu Apr 19 16:11:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/03/24 20:27:42 christos Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/19 16:11:34 xtraeme Exp $
 #
 
 DISTNAME=       nspluginwrapper-0.9.91.3
@@ -36,7 +36,7 @@
        ${INSTALL_SCRIPT} ${WRKDIR}/i386/linux/npviewer ${LINUXLIBDIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/i386/linux/npviewer.bin ${LINUXLIBDIR}
 
-ONLY_FOR_PLATFORM=     *-*-i386
+ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r e72013adfacd -r 3db104289fe0 www/opera-plugins/Makefile
--- a/www/opera-plugins/Makefile        Thu Apr 19 15:31:07 2007 +0000
+++ b/www/opera-plugins/Makefile        Thu Apr 19 16:11:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/09/22 14:40:33 tron Exp $
+# $NetBSD: Makefile,v 1.12 2007/04/19 16:11:34 xtraeme Exp $
 
 DISTNAME=      opera-plugins-1.0
 PKGREVISION=   1
@@ -29,6 +29,8 @@
 # and bump the version number.
 PLUGINS=       libflashplayer.so
 
+SUSE_COMPAT32= yes
+
 INSTALLATION_DIRS=     ${EMULSUBDIR}/usr/lib/opera/plugins
 
 do-install:



Home | Main Index | Thread Index | Old Index