4 files changed, 22 insertions, 33 deletions

diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index a82fae94b272..65ab0cdecc6e 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -7,30 +7,34 @@
 
 PORTNAME=	sane-frontends
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		ftp://ftp.mostang.com/pub/sane/
-MASTER_SITE_SUBDIR=	apps/graphics/capture
+MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
+		ftp://ftp.de.mostang.com/pub/sane/ \
+		ftp://ftp.no.mostang.com/pub/sane/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends
 
-USE_GMAKE=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 USE_GTK=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN1=		xcam.1 xscanimage.1
+
 .if defined(WITH_GIMP)
-LIB_DEPENDS+=	gimp.1:${PORTSDIR}/graphics/gimp1
+LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp1
 CONFIGURE_ARGS+=	--enable-gimp
 .else
 CONFIGURE_ARGS+=	--disable-gimp
 .endif
 
-MAN1=	xcam.1 xscanimage.1
-
-pre-configure:
+pre-everything:
 .if !defined(WITH_GIMP)
 	@${ECHO_MSG} "*** Note: xscanimage can be built with a standalone"
 	@${ECHO_MSG} "*** X scanner interface as well as a GIMP plug-in."
@@ -38,6 +42,10 @@ pre-configure:
 	@${ECHO_MSG} "*** \"WITH_GIMP=yes\""
 .endif
 
+post-patch:
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:' -e 's:%%X11BASE%%:${X11BASE}:' \
+		${PKGDIR}/pkg-message > ${PKGMESSAGE}
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/graphics/sane-frontends/files/patch-configure b/graphics/sane-frontends/files/patch-configure
deleted file mode 100644
index be630f6c2991..000000000000
--- a/graphics/sane-frontends/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Mar 21 17:56:40 2001
-+++ configure	Wed Mar 21 17:56:57 2001
-@@ -3218,6 +3218,7 @@
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
- s%@INCLUDES@%$INCLUDES%g
-+s%@GUIPROGS@%$GUIPROGS%g
- s%@BINPROGS@%$BINPROGS%g
- s%@GIMP_LIBS@%$GIMP_LIBS%g
- s%@V_MAJOR@%$V_MAJOR%g
diff --git a/graphics/sane-frontends/files/patch-src_Makefile.in b/graphics/sane-frontends/files/patch-src_Makefile.in
index 4740a265b0d3..6aefce3cb2ec 100644
--- a/graphics/sane-frontends/files/patch-src_Makefile.in
+++ b/graphics/sane-frontends/files/patch-src_Makefile.in
@@ -1,14 +1,5 @@
---- src/Makefile.in.orig	Fri Dec  1 03:58:38 2000
-+++ src/Makefile.in	Wed Mar 21 17:52:10 2001
-@@ -39,7 +39,7 @@
- GTK_CFLAGS  = @GTK_CFLAGS@
- GIMP_LIBS   = @GIMP_LIBS@
- 
--BINPROGS = @BINPROGS@
-+BINPROGS = @GUIPROGS@
- 
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(GTK_CFLAGS)
- LINK = $(CC) $(LDFLAGS) -o $@
+--- src/Makefile.in.orig	Fri Dec  1 04:58:38 2000
++++ src/Makefile.in	Wed Feb  7 00:14:03 2001
 @@ -59,12 +59,12 @@
  all: $(PROGRAMS)
  
diff --git a/graphics/sane-frontends/pkg-message b/graphics/sane-frontends/pkg-message
index f71412d36130..f39dfb79924b 100644
--- a/graphics/sane-frontends/pkg-message
+++ b/graphics/sane-frontends/pkg-message
@@ -1,9 +1,9 @@
-Congratulations, SANE is now installed.
+Congratulations, SANE-FRONTENDS 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:
+If you built it with GIMP packages/ports installed, you can
+use xscanimage as a GIMP plug-in.  To do this, as root, type:
 
-ln -sf %%LOCALBASE%%/bin/xscanimage %%X11BASE%%/libexec/gimp/1.1/plug-ins/xscanimage
+ln -sf %%PREFIX%%/bin/xscanimage %%X11BASE%%/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.