[pkgsrc/trunk]: pkgsrc/www fix installation on Linux:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5863b2dc54ac
branches:  trunk
changeset: 462932:5863b2dc54ac
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Oct 19 08:20:38 2003 +0000

description:
fix installation on Linux:

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

diffstat:

 www/MozillaFirebird-bin/Makefile             |  18 ++++++++++--------
 www/MozillaFirebird-bin/Makefile.Linux.i386  |   4 +++-
 www/MozillaFirebird-bin/Makefile.NetBSD.i386 |  10 +++++++---
 www/mozilla-bin/Makefile                     |  17 +++++++++--------
 www/mozilla-bin/Makefile.Linux.i386          |   4 +++-
 www/mozilla-bin/Makefile.NetBSD.i386         |   9 ++++++---
 6 files changed, 38 insertions(+), 24 deletions(-)

diffs (143 lines):

diff -r e7a366b225c3 -r 5863b2dc54ac www/MozillaFirebird-bin/Makefile
--- a/www/MozillaFirebird-bin/Makefile  Sun Oct 19 07:46:50 2003 +0000
+++ b/www/MozillaFirebird-bin/Makefile  Sun Oct 19 08:20:38 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/10/19 08:20:38 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
@@ -39,16 +39,18 @@
        @${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so
 
 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/MozillaFirebird-${PLATFORM} >> ${PLIST_SRC}
diff -r e7a366b225c3 -r 5863b2dc54ac www/MozillaFirebird-bin/Makefile.Linux.i386
--- a/www/MozillaFirebird-bin/Makefile.Linux.i386       Sun Oct 19 07:46:50 2003 +0000
+++ b/www/MozillaFirebird-bin/Makefile.Linux.i386       Sun Oct 19 08:20:38 2003 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1 2003/09/27 14:13:08 grant Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.2 2003/10/19 08:20:38 grant Exp $
 #
 
 DISTNAME=      MozillaFirebird-0.6.1-i686-pc-linux-gnu
 MASTER_SITES=  http://ftp.mozilla.org/pub/firebird/releases/0.6.1/
 
+DEPENDS+=      gtk+>=1.2:../../x11/gtk
+
 PLATFORM=      linux
 MOZILLA_LIB=   ${PREFIX}/lib/MozillaFirebird-${PLATFORM}
diff -r e7a366b225c3 -r 5863b2dc54ac www/MozillaFirebird-bin/Makefile.NetBSD.i386
--- a/www/MozillaFirebird-bin/Makefile.NetBSD.i386      Sun Oct 19 07:46:50 2003 +0000
+++ b/www/MozillaFirebird-bin/Makefile.NetBSD.i386      Sun Oct 19 08:20:38 2003 +0000
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1 2003/09/27 14:13:08 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/10/19 08:20:38 grant Exp $
 #
 
+DISTNAME=      MozillaFirebird-0.6.1-i686-pc-linux-gnu
+MASTER_SITES=  http://ftp.mozilla.org/pub/firebird/releases/0.6.1/
+
+PLATFORM=      linux
+MOZILLA_LIB=   ${PREFIX}/lib/MozillaFirebird-${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
 
 CONFLICTS+=    suse_libc5-[0-9]*
 
-.include "Makefile.Linux.i386"
-
 .include "../../emulators/suse_linux/Makefile.application"
diff -r e7a366b225c3 -r 5863b2dc54ac www/mozilla-bin/Makefile
--- a/www/mozilla-bin/Makefile  Sun Oct 19 07:46:50 2003 +0000
+++ b/www/mozilla-bin/Makefile  Sun Oct 19 08:20:38 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/18 07:31:16 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/10/19 08:27:27 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
@@ -41,16 +41,17 @@
        ${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-${PLATFORM}
 
 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 e7a366b225c3 -r 5863b2dc54ac www/mozilla-bin/Makefile.Linux.i386
--- a/www/mozilla-bin/Makefile.Linux.i386       Sun Oct 19 07:46:50 2003 +0000
+++ b/www/mozilla-bin/Makefile.Linux.i386       Sun Oct 19 08:20:38 2003 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2003/07/02 14:56:59 grant Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.3 2003/10/19 08:27:27 grant Exp $
 #
 
 DISTNAME=      mozilla-i686-pc-linux-gnu-1.4
 
+DEPENDS+=      gtk+>=1.2:../../x11/gtk
+
 PLATFORM=      linux
 MOZILLA_LIB=   ${PREFIX}/lib/mozilla-${PLATFORM}
diff -r e7a366b225c3 -r 5863b2dc54ac www/mozilla-bin/Makefile.NetBSD.i386
--- a/www/mozilla-bin/Makefile.NetBSD.i386      Sun Oct 19 07:46:50 2003 +0000
+++ b/www/mozilla-bin/Makefile.NetBSD.i386      Sun Oct 19 08:20:38 2003 +0000
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.3 2003/05/27 08:24:17 kei Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.4 2003/10/19 08:27:27 grant Exp $
 #
 
+DISTNAME=      mozilla-i686-pc-linux-gnu-1.4
+
+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
 
 CONFLICTS+=    suse_libc5-[0-9]*
 
-.include "Makefile.Linux.i386"
-
 .include "../../emulators/suse_linux/Makefile.application"