Date: Fri, 4 Aug 2000 16:50:29 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20425: Update port: graphics/xsane to 0.60 Message-ID: <20000804235029.05A2E37B938@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20425 >Category: ports >Synopsis: Update port: graphics/xsane to 0.60 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 04 17:00:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.60 New file: patches/patch-ab patches/patch-ac patches/patch-ad >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/xsane/Makefile graphics/xsane/Makefile --- /usr/ports/graphics/xsane/Makefile Tue Jul 4 19:02:05 2000 +++ graphics/xsane/Makefile Tue Aug 1 22:30:43 2000 @@ -6,7 +6,7 @@ # PORTNAME= xsane -PORTVERSION= 0.56 +PORTVERSION= 0.60 CATEGORIES= graphics MASTER_SITES= http://www.wolfsburg.de/~rauch/sane/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ @@ -24,24 +24,15 @@ USE_GMAKE= yes USE_X_PREFIX= yes -GNU_CONFIGURE= yes - -MAN1= xsane.1 - +USE_AUTOCONF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" - + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-intl-patch -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 300000 -CONFIGURE_ENV+= LIBS="-Wl,--rpath -Wl,${LOCALBASE}/lib/sane -L${LOCALBASE}/lib" -.else -CONFIGURE_ENV+= LIBS="-Wl,--rpath -Wl,${LOCALBASE}/lib/sane -L${LOCALBASE}/lib -lcam" -.endif +MAN1= xsane.1 post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/graphics/xsane/files/md5 graphics/xsane/files/md5 --- /usr/ports/graphics/xsane/files/md5 Mon Feb 21 06:56:09 2000 +++ graphics/xsane/files/md5 Tue Aug 1 21:54:14 2000 @@ -1 +1 @@ -MD5 (xsane-0.56.tar.gz) = cb9973d04c2c086a80e427cd63324b04 +MD5 (xsane-0.60.tar.gz) = 7a8b9faa712db553af15ef30012f37a7 diff -urN /usr/ports/graphics/xsane/patches/patch-ab graphics/xsane/patches/patch-ab --- /usr/ports/graphics/xsane/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ graphics/xsane/patches/patch-ab Tue Aug 1 22:38:38 2000 @@ -0,0 +1,117 @@ +--- aclocal.m4.orig Tue Nov 9 02:46:16 1999 ++++ aclocal.m4 Tue Aug 1 22:38:29 2000 +@@ -614,16 +614,16 @@ + + + +-# gettext.m4 from gettext 0.32 ++# gettext.m4 from gettext 0.35 + # Macro to add for using GNU gettext. + # Ulrich Drepper <drepper@cygnus.com>, 1995. + # +-# This file file be copied and used freely without restrictions. It can ++# This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU Public License + # but which still want to provide support for the GNU gettext functionality. + # Please note that the actual code is *not* freely available. + +-# serial 3 ++# serial 5 + + AC_DEFUN(AM_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) +@@ -665,9 +665,10 @@ + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, +- [AC_TRY_LINK([], [return (int) gettext ("")], +- gt_cv_func_gettext_libintl=yes, +- gt_cv_func_gettext_libintl=no)])]) ++ [AC_CHECK_LIB(intl, gettext, ++ gt_cv_func_gettext_libintl=yes, ++ gt_cv_func_gettext_libintl=no)], ++ gt_cv_func_gettext_libintl=no)]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ +@@ -685,10 +686,13 @@ + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo +- DATADIRNAME=lib]) ++ DATADIRNAME=share]) + INSTOBJEXT=.mo + fi + fi ++ if test "$gt_cv_func_gettext_libintl" = "yes"; then ++ INTLLIBS='-lintl' ++ fi + ]) + + if test "$CATOBJEXT" = "NONE"; then +@@ -761,7 +765,7 @@ + : ; + else + AC_MSG_RESULT( +- [found xgettext programs is not GNU xgettext; ignore it]) ++ [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi +@@ -773,6 +777,12 @@ + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi ++ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) ++ + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. +@@ -817,9 +827,9 @@ + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +-unistd.h values.h sys/param.h]) ++unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +-__argz_count __argz_stringify __argz_next]) ++strdup __argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) +@@ -895,6 +905,9 @@ + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi +@@ -903,5 +916,20 @@ + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) +- ]) + ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) diff -urN /usr/ports/graphics/xsane/patches/patch-ac graphics/xsane/patches/patch-ac --- /usr/ports/graphics/xsane/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ graphics/xsane/patches/patch-ac Tue Aug 1 22:33:17 2000 @@ -0,0 +1,10 @@ +--- configure.in.orig Sat Apr 22 16:41:46 2000 ++++ configure.in Tue Aug 1 22:33:06 2000 +@@ -124,7 +124,6 @@ + + dnl Check for NLS/gettext + AM_GNU_GETTEXT +-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + + if test "$USE_NLS" = yes; then + if test "$USE_INCLUDED_LIBINTL" = yes; then diff -urN /usr/ports/graphics/xsane/patches/patch-ad graphics/xsane/patches/patch-ad --- /usr/ports/graphics/xsane/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ graphics/xsane/patches/patch-ad Tue Aug 1 23:42:49 2000 @@ -0,0 +1,19 @@ +--- src/Makefile.in.orig Mon Jun 19 04:02:54 2000 ++++ src/Makefile.in Tue Aug 1 23:42:38 2000 +@@ -46,6 +46,7 @@ + + @SET_MAKE@ + ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + PROGRAMS = $(BINPROGS) + LIBLIB = ../lib/liblib.a + +@@ -60,7 +61,7 @@ + all: $(PROGRAMS) + + install: $(PROGRAMS) +- $(MKINSTALLDIRS) $(bindir) $(sbindir) $(datadir) $(sanedatadir) $(sanedatadir)/xsane ++ $(mkinstalldirs) $(bindir) $(sbindir) $(datadir) $(sanedatadir) $(sanedatadir)/xsane + @for program in $(BINPROGS); do \ + $(INSTALL_PROGRAM) $${program} $(bindir)/$${program}; \ + done diff -urN /usr/ports/graphics/xsane/pkg/PLIST graphics/xsane/pkg/PLIST --- /usr/ports/graphics/xsane/pkg/PLIST Mon Feb 21 06:56:10 2000 +++ graphics/xsane/pkg/PLIST Tue Aug 1 23:50:20 2000 @@ -2,29 +2,7 @@ share/locale/cs/LC_MESSAGES/xsane.mo share/locale/de/LC_MESSAGES/xsane.mo share/locale/fr/LC_MESSAGES/xsane.mo -share/sane/xsane/xsane-style.rc -share/sane/xsane-logo.xpm -share/sane/sane-backends-doc.html -share/sane/sane-pnm-doc.html -share/sane/sane-pnm16-doc.html -share/sane/sane-problems-doc.html -share/sane/sane-scantips-doc.html -share/sane/sane-xsane-advanced-doc.html -share/sane/sane-xsane-copy-doc.html -share/sane/sane-xsane-doc.html -share/sane/sane-xsane-enhancement-doc.html -share/sane/sane-xsane-fax-doc.html -share/sane/sane-xsane-gimp-doc.html -share/sane/sane-xsane-histogram-doc.html -share/sane/sane-xsane-main-doc.html -share/sane/sane-xsane-output-formats-doc.html -share/sane/sane-xsane-preview-doc.html -share/sane/sane-xsane-scan-doc.html -share/sane/sane-xsane-setup-copy-doc.html -share/sane/sane-xsane-setup-display-doc.html -share/sane/sane-xsane-setup-fax-doc.html -share/sane/sane-xsane-setup-save-doc.html -share/sane/sane-xsane-standard-doc.html +share/locale/sv/LC_MESSAGES/xsane.mo share/sane/autoenhance.jpg share/sane/brightness.jpg share/sane/contrast.jpg @@ -33,22 +11,45 @@ share/sane/negative.jpg share/sane/restore.jpg share/sane/rgb-default.jpg +share/sane/sane-backends-doc.html share/sane/sane-logo.jpg share/sane/sane-logo2.jpg +share/sane/sane-pnm-doc.html +share/sane/sane-pnm16-doc.html +share/sane/sane-problems-doc.html +share/sane/sane-scantips-doc.html +share/sane/sane-xsane-advanced-doc.html share/sane/sane-xsane-advanced.jpg +share/sane/sane-xsane-copy-doc.html share/sane/sane-xsane-copy.jpg +share/sane/sane-xsane-doc.html +share/sane/sane-xsane-enhancement-doc.html +share/sane/sane-xsane-fax-doc.html share/sane/sane-xsane-fax-project.jpg share/sane/sane-xsane-fax.jpg +share/sane/sane-xsane-gimp-doc.html share/sane/sane-xsane-gimp.jpg +share/sane/sane-xsane-histogram-doc.html share/sane/sane-xsane-histogram.jpg +share/sane/sane-xsane-main-doc.html +share/sane/sane-xsane-output-formats-doc.html share/sane/sane-xsane-pipette-black.jpg share/sane/sane-xsane-pipette-gray.jpg share/sane/sane-xsane-pipette-white.jpg +share/sane/sane-xsane-preview-doc.html share/sane/sane-xsane-preview.jpg +share/sane/sane-xsane-scan-doc.html +share/sane/sane-xsane-setup-copy-doc.html share/sane/sane-xsane-setup-copy.jpg +share/sane/sane-xsane-setup-device-doc.html +share/sane/sane-xsane-setup-device.jpg +share/sane/sane-xsane-setup-display-doc.html share/sane/sane-xsane-setup-display.jpg +share/sane/sane-xsane-setup-fax-doc.html share/sane/sane-xsane-setup-fax.jpg +share/sane/sane-xsane-setup-save-doc.html share/sane/sane-xsane-setup-save.jpg +share/sane/sane-xsane-standard-doc.html share/sane/sane-xsane-standard.jpg share/sane/sane-xsane-visible-area.jpg share/sane/sane-xsane-zoom-in.jpg @@ -57,7 +58,12 @@ share/sane/sane-xsane-zoom-undo.jpg share/sane/sane-xsane.jpg share/sane/store.jpg +share/sane/threshold.jpg +share/sane/xsane/xsane-calibration.pnm +share/sane/xsane/xsane-startimage.pnm +share/sane/xsane/xsane-style.rc share/sane/xsane-logo.jpg +share/sane/xsane-logo.xpm share/sane/xsane-logo2.jpg @dirrm share/sane/xsane @dirrm share/sane >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?20000804235029.05A2E37B938>