[pkgsrc/trunk]: pkgsrc/www/mozilla-bin-nightly fix installation on Linux:

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4357e3d47ad0
branches:  trunk
changeset: 462934:4357e3d47ad0
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Oct 19 08:47:42 2003 +0000

description:
fix installation on Linux:

- s/LOCALBASE/PREFIX/
- s/X11BASE/X11PREFIX/
- install symlink for libgmodule
- depend on gtk

diffstat:

 www/mozilla-bin-nightly/Makefile             |  17 +++++++++--------
 www/mozilla-bin-nightly/Makefile.Linux.i386  |   4 +++-
 www/mozilla-bin-nightly/Makefile.NetBSD.i386 |   9 ++++++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diffs (68 lines):

diff -r 57f34c4fe94c -r 4357e3d47ad0 www/mozilla-bin-nightly/Makefile
--- a/www/mozilla-bin-nightly/Makefile  Sun Oct 19 08:35:09 2003 +0000
+++ b/www/mozilla-bin-nightly/Makefile  Sun Oct 19 08:47:42 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/05 05:59:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/10/19 08:47:42 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
@@ -44,16 +44,17 @@
                | ${XARGS} ${CHMOD} a+rx
 
 post-install:
-# this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
-.if ${OPSYS} == "SunOS"
+# this build wants exactly 'libgtk-1.2.so.0', etc.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
        @cd ${MOZILLA_LIB} && \
-       ${LN} -s ${LOCALBASE}/lib/libglib.*so* .;                       \
-       ${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;                    \
-       ${LN} -s ${X11BASE}/lib/libgdk.*so* .;                          \
-       ${LN} -s ${X11BASE}/lib/libgtk.*so* .;                          \
+       ${LN} -s ${PREFIX}/lib/libglib.*so* .;                          \
+       ${LN} -s ${PREFIX}/lib/libgmodule.*so* .;                       \
+       ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .;                        \
+       ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .;                        \
        ${LN} -s libgtk.so libgtk-1.2.so.0;                             \
        ${LN} -s libgdk.so libgdk-1.2.so.0;                             \
-       ${LN} -s libglib.so libglib-1.2.so.0
+       ${LN} -s libglib.so libglib-1.2.so.0;                           \
+       ${LN} -s libgmodule.so libgmodule-1.2.so.0
 .endif
        @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
        @${ECHO} bin/mozilla-${PLATFORM} >> ${PLIST_SRC}
diff -r 57f34c4fe94c -r 4357e3d47ad0 www/mozilla-bin-nightly/Makefile.Linux.i386
--- a/www/mozilla-bin-nightly/Makefile.Linux.i386       Sun Oct 19 08:35:09 2003 +0000
+++ b/www/mozilla-bin-nightly/Makefile.Linux.i386       Sun Oct 19 08:47:42 2003 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2003/06/11 17:20:56 grant Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.3 2003/10/19 08:47:42 grant Exp $
 #
 
 DISTNAME=      mozilla-i686-pc-linux-gnu
 
+DEPENDS+=      gtk+>=1.2:../../x11/gtk
+
 PLATFORM=      linux
 MOZILLA_LIB=   ${PREFIX}/lib/mozilla-${PLATFORM}
diff -r 57f34c4fe94c -r 4357e3d47ad0 www/mozilla-bin-nightly/Makefile.NetBSD.i386
--- a/www/mozilla-bin-nightly/Makefile.NetBSD.i386      Sun Oct 19 08:35:09 2003 +0000
+++ b/www/mozilla-bin-nightly/Makefile.NetBSD.i386      Sun Oct 19 08:47:42 2003 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2003/05/20 14:25:14 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/10/19 08:47:42 grant Exp $
 #
 
+DISTNAME=      mozilla-i686-pc-linux-gnu
+
+PLATFORM=      linux
+MOZILLA_LIB=   ${PREFIX}/lib/mozilla-${PLATFORM}
+
 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"