From a274c4a590454cc1aa516e327b490ef981ef2885 Mon Sep 17 00:00:00 2001 From: grant Date: Mon, 14 Apr 2003 21:28:10 +0000 Subject: [PATCH] add support for the Solaris/sparc binary package, tested on Solaris 9. tidy up NetBSD/Linux support while I'm here - no functional changes, so no PKGREVISION bump. --- www/phoenix-bin-nightly/Makefile | 37 ++++++++++++++------ www/phoenix-bin-nightly/Makefile.Linux.i386 | 7 ++++ www/phoenix-bin-nightly/Makefile.NetBSD.i386 | 10 +++--- www/phoenix-bin-nightly/Makefile.SunOS.sparc | 9 +++++ www/phoenix-bin-nightly/PLIST | 4 +-- www/phoenix-bin-nightly/files/phoenix.sh | 10 ++++-- 6 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 www/phoenix-bin-nightly/Makefile.Linux.i386 create mode 100644 www/phoenix-bin-nightly/Makefile.SunOS.sparc diff --git a/www/phoenix-bin-nightly/Makefile b/www/phoenix-bin-nightly/Makefile index 5f8fbcfe6b09..0dc41ea7cbbf 100644 --- a/www/phoenix-bin-nightly/Makefile +++ b/www/phoenix-bin-nightly/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2003/04/14 20:18:19 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/04/14 21:28:10 grant Exp $ # -DISTNAME= phoenix-i686-pc-linux-gnu +#DISTNAME= # see Makefile.${OPSYS}.${ARCH} PKGNAME= phoenix-bin-${PKGVER} WRKSRC= ${WRKDIR}/phoenix CATEGORIES= www @@ -11,7 +11,7 @@ MAINTAINER= grant@netbsd.org HOMEPAGE= http://www.mozilla.org/projects/phoenix/ COMMENT= Lightweight gecko-based web browser (nightly binary pkg) -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 +ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc CONFLICTS+= phoenix-linux-[0-9]* @@ -19,32 +19,49 @@ PKGVER!= date +%Y%m%d DIST_SUBDIR= ${PKGNAME} NO_CHECKSUM= # defined NO_CONFIGURE= # defined +USE_PKGINSTALL= YES +.include "../../mk/bsd.prefs.mk" + +FILES_SUBST+= PLATFORM=${PLATFORM} PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PHOENIX_LIB= ${PREFIX}/lib/phoenix-linux do-build: post-build: - ${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/phoenix.sh > \ - ${WRKDIR}/phoenix.sh + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/phoenix.sh > ${WRKDIR}/phoenix.sh do-install: ${INSTALL_DATA_DIR} ${PHOENIX_LIB} - cd ${WRKSRC} && ${CP} -r . ${PHOENIX_LIB} - ${INSTALL_SCRIPT} ${WRKDIR}/phoenix.sh ${PREFIX}/bin/phoenix-linux + cd ${WRKSRC} && ${PAX} -rw -pm . ${PHOENIX_LIB} + ${INSTALL_SCRIPT} ${WRKDIR}/phoenix.sh ${PREFIX}/bin/phoenix-${PLATFORM} + @${FIND} ${PHOENIX_LIB} -type f -print \ + | ${XARGS} ${CHMOD} a+r + @${FIND} ${PHOENIX_LIB} \( -type f -o -perm +x \) -print \ + | ${XARGS} ${CHMOD} a+rx + @${FIND} ${PHOENIX_LIB} -type d -print \ + | ${XARGS} ${CHMOD} a+rx post-install: @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} + @${ECHO} bin/phoenix-${PLATFORM} >> ${PLIST_SRC} @${FIND} ${PHOENIX_LIB} \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \ >> ${PLIST_SRC} +# this build for Solaris wants exactly 'libgtk-1.2.so.0' +.if ${OPSYS} == "SunOS" + @cd ${PHOENIX_LIB} && \ + ${LN} -s ${LOCALBASE}/lib/libglib.so libglib-1.2.so.0; \ + ${LN} -s ${X11BASE}/lib/libgdk.so libgdk-1.2.so.0; \ + ${LN} -s ${X11BASE}/lib/libgtk.so libgtk-1.2.so.0 +. for _lib_ in glib gdk gtk + @${ECHO} lib/phoenix-${PLATFORM}/lib${_lib_}-1.2.so.0 >> ${PLIST_SRC} +. endfor +.endif @${FIND} ${PHOENIX_LIB} -type d -print \ | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \ >> ${PLIST_SRC} -.include "../../mk/bsd.prefs.mk" - # everything specific to your OS/Arch goes into it's own Makefile # group together i386, i486, i586 and i686 (for Linux) ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g} diff --git a/www/phoenix-bin-nightly/Makefile.Linux.i386 b/www/phoenix-bin-nightly/Makefile.Linux.i386 new file mode 100644 index 000000000000..c4c0b8fc5fb7 --- /dev/null +++ b/www/phoenix-bin-nightly/Makefile.Linux.i386 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.Linux.i386,v 1.1 2003/04/14 21:28:10 grant Exp $ +# + +DISTNAME= phoenix-i686-pc-linux-gnu + +PLATFORM= linux +PHOENIX_LIB= ${PREFIX}/lib/phoenix-${PLATFORM} diff --git a/www/phoenix-bin-nightly/Makefile.NetBSD.i386 b/www/phoenix-bin-nightly/Makefile.NetBSD.i386 index 055b58f9105d..f16fbd8d33aa 100644 --- a/www/phoenix-bin-nightly/Makefile.NetBSD.i386 +++ b/www/phoenix-bin-nightly/Makefile.NetBSD.i386 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.1 2003/04/14 20:11:48 grant Exp $ +# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/04/14 21:28:10 grant Exp $ # -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk +DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 +DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk + +.include "Makefile.Linux.i386" .include "../../emulators/suse_linux/Makefile.application" diff --git a/www/phoenix-bin-nightly/Makefile.SunOS.sparc b/www/phoenix-bin-nightly/Makefile.SunOS.sparc new file mode 100644 index 000000000000..7c20461cb3d2 --- /dev/null +++ b/www/phoenix-bin-nightly/Makefile.SunOS.sparc @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/04/14 21:28:10 grant Exp $ +# + +DISTNAME= phoenix-sparc-sun-solaris2.7-static + +DEPENDS+= gtk+>=1.2:../../x11/gtk + +PLATFORM= ${LOWER_OPSYS} +PHOENIX_LIB= ${PREFIX}/lib/phoenix-${PLATFORM} diff --git a/www/phoenix-bin-nightly/PLIST b/www/phoenix-bin-nightly/PLIST index 950872b07954..4909e05651c7 100644 --- a/www/phoenix-bin-nightly/PLIST +++ b/www/phoenix-bin-nightly/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2003/04/14 20:11:49 grant Exp $ -bin/phoenix-linux +@comment $NetBSD: PLIST,v 1.2 2003/04/14 21:28:10 grant Exp $ +@comment this PLIST intentionally left blank diff --git a/www/phoenix-bin-nightly/files/phoenix.sh b/www/phoenix-bin-nightly/files/phoenix.sh index bddb1ecba897..fb19bf243878 100644 --- a/www/phoenix-bin-nightly/files/phoenix.sh +++ b/www/phoenix-bin-nightly/files/phoenix.sh @@ -1,3 +1,7 @@ -#!/bin/sh -# $NetBSD: phoenix.sh,v 1.1 2003/04/14 20:11:49 grant Exp $ -exec @PREFIX@/lib/phoenix-linux/phoenix "$@" +#!@SH@ +# $NetBSD: phoenix.sh,v 1.2 2003/04/14 21:28:11 grant Exp $ + +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/phoenix-@PLATFORM@" +export LD_LIBRARY_PATH + +exec @PREFIX@/lib/phoenix-@PLATFORM@/phoenix "$@"