summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorgrant <grant>2004-05-15 13:22:27 +0000
committergrant <grant>2004-05-15 13:22:27 +0000
commit5721f9655a133dcf22390b6704cfedbb9d02f858 (patch)
tree38597153d06ff14838e8ab9daf43cee748c674a3 /www
parent5e78a9b50e953116126258631a563f5850901a8d (diff)
downloadpkgsrc-5721f9655a133dcf22390b6704cfedbb9d02f858.tar.gz
fix handling of gtk and gtk2 dependencies.
Diffstat (limited to 'www')
-rw-r--r--www/mozilla-bin/Makefile.common14
1 files changed, 4 insertions, 10 deletions
diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common
index 0d7ce67342c..9aab63d53de 100644
--- a/www/mozilla-bin/Makefile.common
+++ b/www/mozilla-bin/Makefile.common
@@ -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_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
-# 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)