Some cleanup.

Remove an ancient workaround for gcc2 on sparc64.

XXX: I don't get why options.mk is not included on HPUX and OSF1;
it could pull in the fam package like on other platforms, or just default
fam to off on those platforms if the fam package does not work on those
platforms.

2 files changed, 8 insertions, 13 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index a9f7581ab1c..3326af3113e 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2008/11/29 19:09:04 jmcneill Exp $
+# $NetBSD: Makefile,v 1.150 2008/12/01 13:25:47 wiz Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -44,11 +44,6 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
 CONFIGURE_ARGS+=	--with-pcre=system
-# need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE:Q}
 
 CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
 
@@ -64,7 +59,6 @@ CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 .if ${OPSYS} == "FreeBSD"
-
 SUBST_CLASSES+=		thr
 SUBST_STAGE.thr=	post-patch
 SUBST_FILES.thr=	gthread/Makefile.in
@@ -92,9 +86,6 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
 
 PLIST_VARS+=		fam
 
-# Overridden in options.mk.
-CONFIGURE_ARGS+=	--disable-fam
-
 .if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
 .include "options.mk"
 .endif
@@ -108,6 +99,8 @@ CONFIGURE_ARGS+=	--disable-threads
 .else
 .include "../../mk/pthread.buildlink3.mk"
 .endif
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .include "../../devel/pcre/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/options.mk b/devel/glib2/options.mk
index 36d537e9e8a..61d6acc1d39 100644
--- a/devel/glib2/options.mk
+++ b/devel/glib2/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2008/05/28 21:20:48 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2008/12/01 13:25:47 wiz Exp $
 #
 # This file is *not* included for HPUX and OSF1, as they don't have
 # a working FAM implementation. 
 
 PKG_OPTIONS_VAR =	PKG_OPTIONS.glib2
-
-PKG_SUGGESTED_OPTIONS=	fam
 PKG_SUPPORTED_OPTIONS=	fam
+PKG_SUGGESTED_OPTIONS=	fam
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mfam)
@@ -24,4 +24,6 @@ SUBST_SED.fam-linkage=		-e 's,^FAM_LIBS =.*$$,FAM_LIBS = -lfam -lC,g'
 
 BUILDLINK_TRANSFORM+=		l:fam:fam:C
 .  endif
+.else
+CONFIGURE_ARGS+=	--disable-fam
 .endif