- Fix MASTER_SITES

- Utilize USE_GNOME
- Add WITHOUT_NLS

PR:		ports/66467
Submitted by:	Ports Fury

3 files changed, 29 insertions, 40 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index c4388d25c44..7b9cf2e1e2b 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	sane-backends
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
-		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
-		ftp://ftp.no.mostang.com/pub/sane/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION} \
-			old-versions/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	ftp://ftp.no.mostang.com/pub/sane/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
@@ -20,23 +17,29 @@ COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_REINPLACE=	yes
-USE_GETTEXT=	yes
+USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-translations
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 .if defined(WITH_GPHOTO2)
 LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/gphoto2
-CONFIGURE_ARGS+=	--with-gphoto2=yes
 PLIST_SUB+=	GPHOTO2=""
 .else
+CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
@@ -48,9 +51,5 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's| -I/usr/local/include||g ; \
-		 s|gphoto2 2.0.1|gphoto2 2.0|g' ${WRKSRC}/configure
-
 .include "Makefile.man"
 .include <bsd.port.post.mk>
diff --git a/graphics/sane-backends/files/patch-configure b/graphics/sane-backends/files/patch-configure
deleted file mode 100644
index 038a0497424..00000000000
--- a/graphics/sane-backends/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat May 25 17:00:48 2002
-+++ configure	Wed May 29 21:41:38 2002
-@@ -8490,6 +8490,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 007cbb876cc..625ffd5defc 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -266,10 +266,10 @@ sbin/saned
 %%PORTDOCS%%share/doc/sane/plustek/Plustek-USB.txt
 %%PORTDOCS%%share/doc/sane/plustek/VERSION0
 %%PORTDOCS%%share/doc/sane/plustek/VERSION1
-%%PORTDOCS%%share/doc/sane/sane-backends.html
 %%PORTDOCS%%share/doc/sane/sane-backends-external.html
-%%PORTDOCS%%share/doc/sane/sane-mfgs.html
+%%PORTDOCS%%share/doc/sane/sane-backends.html
 %%PORTDOCS%%share/doc/sane/sane-mfgs-external.html
+%%PORTDOCS%%share/doc/sane/sane-mfgs.html
 %%PORTDOCS%%share/doc/sane/sceptre/s1200.txt
 %%PORTDOCS%%share/doc/sane/teco/teco1.txt
 %%PORTDOCS%%share/doc/sane/teco/teco2.txt
@@ -303,24 +303,24 @@ sbin/saned
 %%PORTDOCS%%share/doc/sane/umax/umax.CHANGES
 %%PORTDOCS%%share/doc/sane/umax/umax.FAQ
 %%PORTDOCS%%share/doc/sane/umax/umax.TODO
-share/locale/bg/LC_MESSAGES/sane-backends.mo
-share/locale/cs/LC_MESSAGES/sane-backends.mo
-share/locale/da/LC_MESSAGES/sane-backends.mo
-share/locale/de/LC_MESSAGES/sane-backends.mo
-share/locale/es/LC_MESSAGES/sane-backends.mo
-share/locale/fr/LC_MESSAGES/sane-backends.mo
-share/locale/it/LC_MESSAGES/sane-backends.mo
-share/locale/nl/LC_MESSAGES/sane-backends.mo
-share/locale/no/LC_MESSAGES/sane-backends.mo
-share/locale/pt/LC_MESSAGES/sane-backends.mo
-share/locale/ru/LC_MESSAGES/sane-backends.mo
-share/locale/sv/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/no/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo
 @exec mkdir %D/share/sane
 @exec mkdir %D/share/sane/gt68xx
 @unexec rmdir %D/share/sane/gt68xx 2>/dev/null || true
 @unexec rmdir %D/share/sane 2>/dev/null || true
-%%PORTDOCS%%@dirrm share/doc/sane/u12
 %%PORTDOCS%%@dirrm share/doc/sane/umax
+%%PORTDOCS%%@dirrm share/doc/sane/u12
 %%PORTDOCS%%@dirrm share/doc/sane/teco
 %%PORTDOCS%%@dirrm share/doc/sane/sceptre
 %%PORTDOCS%%@dirrm share/doc/sane/plustek