Date: Mon, 26 Mar 2001 06:21:29 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/26100: Update port: graphics/sane-frontends Message-ID: <200103261421.f2QELTh94365@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 26100
>Category: ports
>Synopsis: Update port: graphics/sane-frontends
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 26 06:30:02 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Reorganize MASTER_SITES
- Fix PKGMESSAGE handling
Remove file:
files/patch-configure
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/sane-frontends/Makefile graphics/sane-frontends/Makefile
--- /usr/ports/graphics/sane-frontends/Makefile Thu Mar 22 22:36:19 2001
+++ graphics/sane-frontends/Makefile Mon Mar 26 23:04:06 2001
@@ -7,36 +7,44 @@
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."
@${ECHO_MSG} "*** If you wish to do this, hit Ctrl-C now and use"
@${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 -urN /usr/ports/graphics/sane-frontends/files/patch-configure graphics/sane-frontends/files/patch-configure
--- /usr/ports/graphics/sane-frontends/files/patch-configure Thu Mar 22 18:15:07 2001
+++ graphics/sane-frontends/files/patch-configure Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/graphics/sane-frontends/files/patch-src_Makefile.in graphics/sane-frontends/files/patch-src_Makefile.in
--- /usr/ports/graphics/sane-frontends/files/patch-src_Makefile.in Thu Mar 22 18:15:07 2001
+++ graphics/sane-frontends/files/patch-src_Makefile.in Wed Feb 7 00:14:10 2001
@@ -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 -urN /usr/ports/graphics/sane-frontends/pkg-message graphics/sane-frontends/pkg-message
--- /usr/ports/graphics/sane-frontends/pkg-message Thu Mar 22 22:36:21 2001
+++ graphics/sane-frontends/pkg-message Mon Mar 26 22:48:02 2001
@@ -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.
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103261421.f2QELTh94365>