[pkgsrc/pkgsrc-2003Q4]: pkgsrc/www/galeon Pullup versions 1.55, 1.56 and 1.57...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b558876f8f5
branches:  pkgsrc-2003Q4
changeset: 463703:1b558876f8f5
user:      agc <agc%pkgsrc.org@localhost>
date:      Thu Dec 11 19:48:11 2003 +0000

description:
Pullup versions 1.55, 1.56 and 1.57 to the pkgsrc-2003Q4 branch, to let
galeon build and function correctly with Mozilla-1.5.1. Requested by
Alistair Crooks.

        revision 1.57
        date: 2003/12/11 16:01:49;  author: agc;  state: Exp;  lines: +4 -4
        work/.buildlink -> ${BUILDLINK_DIR} to make it work on more systems.
        ----------------------------
        revision 1.56
        date: 2003/12/10 18:22:45;  author: abs;  state: Exp;  lines: +7 -2
        Tweak (ugly) post-buildlink: hack to only occur if gcc3 is found. Tested on:
            - i386 current (1.6ZE)
            - i386 1.6.2_RC3
            - i386 1.6.2_RC3 with USE_GCC3
        Previous version was committed by accident
        No change to generated package, only to if package could be generated at all,
        so no PKGREVISION change.
        Does not fix, but provides a workaround for PR pkg/23053 and PR pkg/23509
        ----------------------------
        revision 1.55
        date: 2003/11/27 15:03:36;  author: abs;  state: Exp;  lines: +7 -5
        Update galeon to 1.2.13 to match mozilla update to 1.5.1:
                Changelog since 1.2.11 mainly indicates sync with new mozilla API.
                1.2.13 wants mozilla 1.5 but we are giving it 1.5.1. All appears to
                work fine.

diffstat:

 www/galeon/Makefile |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 9e125020dc61 -r 1b558876f8f5 www/galeon/Makefile
--- a/www/galeon/Makefile       Thu Dec 11 13:50:04 2003 +0000
+++ b/www/galeon/Makefile       Thu Dec 11 19:48:11 2003 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: Makefile,v 1.54.2.1 2003/12/11 19:48:11 agc Exp $
 
-DISTNAME=      galeon-1.2.11
-PKGREVISION=   3
+DISTNAME=      galeon-1.2.13
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=galeon/}
 
@@ -30,8 +29,8 @@
                        --disable-applet \
                        --disable-werror \
                        --sysconfdir=${PREFIX}/etc
-# XXX to build against mozilla 1.4
-CONFIGURE_ARGS+= --with-mozilla-snapshot=1.4
+# XXX to build against mozilla 1.5
+CONFIGURE_ARGS+= --with-mozilla-snapshot=1.5
 
 .include       "../../converters/libiconv/buildlink2.mk"
 .include       "../../devel/GConf/buildlink2.mk"
@@ -54,6 +53,14 @@
 pre-install:
        ${GCONF_PREFIX}/bin/gconftool --shutdown
 
+.if !empty(CC_VERSION:Mgcc-3*)
+# Workaround for gcc3 build issue
+post-buildlink:
+       ${CP} ${BUILDLINK_DIR}/bin/cc ${BUILDLINK_DIR}/bin/cc.orig
+       ${SED} 's:\(exec \$$cmd\):\1 -lstdc++ -lm:' ${BUILDLINK_DIR}/bin/cc.orig\
+                                               > ${BUILDLINK_DIR}/bin/cc
+.endif
+
 post-install:
        ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA_PREFIX@,${MOZILLA_PREFIX},g" ${FILESDIR}/galeon.in > ${PREFIX}/bin/galeon
        ${CHOWN} ${BINOWN} ${PREFIX}/bin/galeon