Fix following kernel error message.

cam_periph_mapmem: attempt to map 68712 bytes, which is
 greater than DFLTPHYS(65536)
Update depended gtk version to gtk-1.2.x
PR: ports/10147
Submitted by: paterno@dsi.unifi.it

6 files changed, 15 insertions, 15 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 6f5706fca32b..f8abf48723da 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -4,7 +4,7 @@
 # Whom:				gary@hotlava.com
 #				obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.12 1998/12/06 09:37:28 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/01/22 22:10:04 nectar Exp $
 #
 
 DISTNAME=       sane-1.00
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 VERSION!=	sysctl -n kern.osreldate
@@ -24,11 +24,11 @@ GNU_CONFIGURE=	yes
 .if ${VERSION} < 300000
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .else
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lcam" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .endif
 
 MAN1=		scanimage.1 \
diff --git a/graphics/sane-backends/pkg-message b/graphics/sane-backends/pkg-message
index 83451c2636de..2990a3c62111 100644
--- a/graphics/sane-backends/pkg-message
+++ b/graphics/sane-backends/pkg-message
@@ -3,7 +3,7 @@ Congratulations, SANE is now installed.
 If you built it with GIMP and GTK packages/ports installed, you can
 use SANE as a GIMP plug-in.  To do this, as root, type:
 
-ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/plug-ins/xscanimage
+ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/1.1/plug-ins/xscanimage
 
 Then run the GIMP, and a new "Acquire" menu item should appear in the
 "Xtras" menu.  Use this to access your scanner.
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 6f5706fca32b..f8abf48723da 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -4,7 +4,7 @@
 # Whom:				gary@hotlava.com
 #				obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.12 1998/12/06 09:37:28 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/01/22 22:10:04 nectar Exp $
 #
 
 DISTNAME=       sane-1.00
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 VERSION!=	sysctl -n kern.osreldate
@@ -24,11 +24,11 @@ GNU_CONFIGURE=	yes
 .if ${VERSION} < 300000
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .else
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lcam" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .endif
 
 MAN1=		scanimage.1 \
diff --git a/graphics/sane-frontends/pkg-message b/graphics/sane-frontends/pkg-message
index 83451c2636de..2990a3c62111 100644
--- a/graphics/sane-frontends/pkg-message
+++ b/graphics/sane-frontends/pkg-message
@@ -3,7 +3,7 @@ Congratulations, SANE is now installed.
 If you built it with GIMP and GTK packages/ports installed, you can
 use SANE as a GIMP plug-in.  To do this, as root, type:
 
-ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/plug-ins/xscanimage
+ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/1.1/plug-ins/xscanimage
 
 Then run the GIMP, and a new "Acquire" menu item should appear in the
 "Xtras" menu.  Use this to access your scanner.
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 6f5706fca32b..f8abf48723da 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -4,7 +4,7 @@
 # Whom:				gary@hotlava.com
 #				obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.12 1998/12/06 09:37:28 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/01/22 22:10:04 nectar Exp $
 #
 
 DISTNAME=       sane-1.00
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 VERSION!=	sysctl -n kern.osreldate
@@ -24,11 +24,11 @@ GNU_CONFIGURE=	yes
 .if ${VERSION} < 300000
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .else
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lcam" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .endif
 
 MAN1=		scanimage.1 \
diff --git a/graphics/sane/pkg-message b/graphics/sane/pkg-message
index 83451c2636de..2990a3c62111 100644
--- a/graphics/sane/pkg-message
+++ b/graphics/sane/pkg-message
@@ -3,7 +3,7 @@ Congratulations, SANE is now installed.
 If you built it with GIMP and GTK packages/ports installed, you can
 use SANE as a GIMP plug-in.  To do this, as root, type:
 
-ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/plug-ins/xscanimage
+ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/1.1/plug-ins/xscanimage
 
 Then run the GIMP, and a new "Acquire" menu item should appear in the
 "Xtras" menu.  Use this to access your scanner.