summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2012-05-09 18:39:35 +0000
committertron <tron>2012-05-09 18:39:35 +0000
commitf5aee27ac386a98b2d20906636a7c3a507348647 (patch)
tree1cb7455294819f40953544c98c0fbeef23468f9d
parentd81963b70e898afc90931c89a81ac75661781495 (diff)
downloadpkgsrc-f5aee27ac386a98b2d20906636a7c3a507348647.tar.gz
Explicitly disable TWAIN support for Mac OS X:
1.) It doesn't seem to get detected under Mac OS X Lion. 2.) It doesn't compile under Mac OS X Snow Leopard, see <https://bugzilla.gnome.org/show_bug.cgi?id=675510>. While here really remove the conditional package list handling related to TWAIN support. No package revision bump necessary as the binary package doesn't change on the one Mac OS X version where the package actually built.
-rw-r--r--graphics/gimp/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 51159a9c974..90a33b173bb 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.212 2012/05/07 08:40:07 adam Exp $
+# $NetBSD: Makefile,v 1.213 2012/05/09 18:39:35 tron Exp $
DISTNAME= gimp-2.8.0
CATEGORIES= graphics
@@ -38,6 +38,7 @@ CONFIGURE_ARGS+= --disable-perl
CONFIGURE_ARGS+= --disable-python
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --without-linux-input
+CONFIGURE_ARGS+= --without-mac-twain
UNLIMIT_RESOURCES+= datasize
@@ -49,10 +50,7 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-PLIST_VARS+= remote twain
-.if exists(/System/Library/Frameworks/TWAIN.framework)
-PLIST.twain= yes
-.endif
+PLIST_VARS+= remote
.include "options.mk"