[pkgsrc/trunk]: pkgsrc/www/mozilla-bin *really* allow MOZ_EXTRA to be overrid...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffc5c687c471
branches:  trunk
changeset: 465784:ffc5c687c471
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Jan 06 01:33:32 2004 +0000

description:
*really* allow MOZ_EXTRA to be overridden and fix gtk2 dependency.
fixes gtk2 packages.

diffstat:

 www/mozilla-bin/Makefile.common |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 3e160bd87221 -r ffc5c687c471 www/mozilla-bin/Makefile.common
--- a/www/mozilla-bin/Makefile.common   Tue Jan 06 01:19:02 2004 +0000
+++ b/www/mozilla-bin/Makefile.common   Tue Jan 06 01:33:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/04 05:06:19 grant Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/01/06 01:33:32 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
@@ -37,9 +37,10 @@
 .endif
 
 # suffix gtk2 builds with -gtk2
-MOZ_EXTRA=     # empty
 .if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
 MOZ_EXTRA?=    -gtk2
+.else
+MOZ_EXTRA?=    # empty
 .endif
 
 MOZILLA_LIB=   ${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}
@@ -84,7 +85,7 @@
 
 # gtk2 builds.
 .    if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
-DEPENDS+=      gtk+>=2.2:../../x11/gtk2
+DEPENDS+=      gtk2+>=2.2:../../x11/gtk2
 .    else
 
 # default to at least gtk-1.2.
@@ -158,7 +159,7 @@
                ${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* .
 .endif
        @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-       @${ECHO} bin/${MOZILLA}-${MOZ_PLATFORM} >> ${PLIST_SRC}
+       @${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC}
        @${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print         \
                | ${SORT} | ${SED} -e "s,${PREFIX}/,,g"                 \
                >> ${PLIST_SRC}