[pkgsrc/trunk]: pkgsrc/x11/gtk2 Resolve conflicting edits: back out my change...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7c60364d8ae
branches:  trunk
changeset: 394870:e7c60364d8ae
user:      asau <asau%pkgsrc.org@localhost>
date:      Wed Jun 17 18:40:55 2009 +0000

description:
Resolve conflicting edits: back out my change, expand comment.

diffstat:

 x11/gtk2/Makefile |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r a9b876471b8e -r e7c60364d8ae x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Wed Jun 17 17:57:55 2009 +0000
+++ b/x11/gtk2/Makefile Wed Jun 17 18:40:55 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.178 2009/06/17 17:57:55 asau Exp $
+# $NetBSD: Makefile,v 1.179 2009/06/17 18:40:55 asau Exp $
 
 DISTNAME=              gtk+-2.16.2
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
@@ -28,7 +28,7 @@
 
 GNU_CONFIGURE=          yes
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/libdata
-# papi support doesn't build
+# Work around build problems, disable unstable PAPI, PR #41608:
 CONFIGURE_ARGS+=       --disable-papi
 MAKE_ENV+=             PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 TEST_TARGET=           check
@@ -63,11 +63,6 @@
 DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
 
-# Work around build problems, disable unstable PAPI, PR #41608:
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=       --disable-papi
-.endif
-
 .include "options.mk"
 
 # We remove the module databases during post-install since we create them