[pkgsrc/trunk]: pkgsrc/www/mozilla-bin fix handling of gtk and gtk2 dependenc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1315bcf5f047
branches:  trunk
changeset: 475391:1315bcf5f047
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat May 15 13:22:27 2004 +0000

description:
fix handling of gtk and gtk2 dependencies.

diffstat:

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

diffs (38 lines):

diff -r 4b40a6f7641a -r 1315bcf5f047 www/mozilla-bin/Makefile.common
--- a/www/mozilla-bin/Makefile.common   Sat May 15 13:22:03 2004 +0000
+++ b/www/mozilla-bin/Makefile.common   Sat May 15 13:22:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/02/16 11:33:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/05/15 13:22:27 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
@@ -78,25 +78,19 @@
 DEPENDS+=      suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DEPENDS+=      suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk
 
-# NetBSD native builds are built with gtk-1.2.10nb5.
 .  elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd"
-DEPENDS+=      gtk+>=1.2.10nb5:../../x11/gtk
-
 # we need libstdc++.so.4 on -current.
 .    if !exists(/usr/lib/libstdc++.so.4)
 DEPENDS+=      compat16>=1.6.0:../../emulators/compat16
 _COMPAT16_LIBSTDCXX=   YES
 .    endif
-.  else
-
+.  endif
+.  if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
 # gtk2 builds.
-.    if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
 DEPENDS+=      gtk2+>=2.2:../../x11/gtk2
-.    else
-
+.  else
 # default to at least gtk-1.2.
 DEPENDS+=      gtk+>=1.2:../../x11/gtk
-.    endif
 .  endif
 
 .endif # defined(MOZ_PLATFORM)