- Add MASTER_SITE_SUNSITE to MASTER_SITES - Support USE_LIBTOOL - Add WWW: line into pkg/PLIST Remove file: patches/patch-02 patches/patch-03 Fix: Sent by Japanese ProntoMail--f9UlVqf3iF9nlrXh04By95TfstrNnbJQR3ClYQyG3agACAEv Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -urN /usr/ports/graphics/sane/Makefile graphics/sane/Makefile --- /usr/ports/graphics/sane/Makefile Sat Feb 5 20:16:20 2000 +++ graphics/sane/Makefile Thu Feb 10 05:27:35 2000 @@ -8,10 +8,11 @@ DISTNAME= sane-1.0.1 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \ - ftp://ftp.lahn.de/pub/platforms/linux/libs/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} \ + ftp://ftp.mostang.com/pub/sane/ +MASTER_SITE_SUBDIR= apps/graphics/capture -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg @@ -21,7 +22,7 @@ .include <bsd.port.pre.mk> USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes .if ${OSVERSION} < 300000 CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ diff -urN /usr/ports/graphics/sane/patches/patch-02 graphics/sane/patches/patch-02 --- /usr/ports/graphics/sane/patches/patch-02 Sat May 22 19:37:01 1999 +++ graphics/sane/patches/patch-02 Thu Jan 1 09:00:00 1970 @@ -1,42 +0,0 @@ ---- ltconfig Sat Nov 21 19:53:55 1998 -+++ ltconfig.new Thu May 13 12:44:40 1999 -@@ -604,11 +604,11 @@ - $rm conftestdata - if ln -s X conftestdata 2>/dev/null; then - $rm conftestdata -- LN_S="ln -s" -+ LN_S="ln -sf" - else - LN_S=ln - fi -- if test "$LN_S" = "ln -s"; then -+ if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 -@@ -1123,12 +1123,24 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - --freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; -+ -+freebsd3* | freebsd4*) -+ version_type=freebsd -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' -+ if [ $PORTOBJFORMAT = elf ]; then -+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir' -+ else -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - - gnu*) - version_type=sunos diff -urN /usr/ports/graphics/sane/patches/patch-03 graphics/sane/patches/patch-03 --- /usr/ports/graphics/sane/patches/patch-03 Sat May 22 19:37:01 1999 +++ graphics/sane/patches/patch-03 Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- ltmain.sh Mon Nov 2 21:05:05 1998 -+++ ltmain.sh.new Thu May 13 12:24:53 1999 -@@ -966,6 +966,17 @@ - major="$current" - versuffix="$current.$revision" - ;; -+ freebsd) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix="$current"; -+ else -+ versuffix="$current.$revision"; -+ fi -+ ;; -+ -+ - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 diff -urN /usr/ports/graphics/sane/pkg/DESCR graphics/sane/pkg/DESCR --- /usr/ports/graphics/sane/pkg/DESCR Sun Mar 1 09:44:59 1998 +++ graphics/sane/pkg/DESCR Sun Feb 6 10:09:15 2000 @@ -5,3 +5,5 @@ write 12 different programs. With SANE, this number is reduced to seven: the three applications plus the four drivers. Of course, the savings get even bigger as more and more drivers and/or applications are added. + +WWW: http://www.mostang.com/sane/ diff -urN /usr/ports/graphics/sane/pkg/PLIST graphics/sane/pkg/PLIST --- /usr/ports/graphics/sane/pkg/PLIST Sat May 29 19:39:22 1999 +++ graphics/sane/pkg/PLIST Mon Feb 7 21:04:04 2000 @@ -38,95 +38,72 @@ lib/libsane.so lib/libsane.so.1 lib/sane/libsane-abaton.a -lib/sane/libsane-abaton.la lib/sane/libsane-abaton.so lib/sane/libsane-abaton.so.1 lib/sane/libsane-agfafocus.a -lib/sane/libsane-agfafocus.la lib/sane/libsane-agfafocus.so lib/sane/libsane-agfafocus.so.1 lib/sane/libsane-apple.a -lib/sane/libsane-apple.la lib/sane/libsane-apple.so lib/sane/libsane-apple.so.1 lib/sane/libsane-artec.a -lib/sane/libsane-artec.la lib/sane/libsane-artec.so lib/sane/libsane-artec.so.1 lib/sane/libsane-canon.a -lib/sane/libsane-canon.la lib/sane/libsane-canon.so lib/sane/libsane-canon.so.1 lib/sane/libsane-coolscan.a -lib/sane/libsane-coolscan.la lib/sane/libsane-coolscan.so lib/sane/libsane-coolscan.so.1 lib/sane/libsane-dc210.a -lib/sane/libsane-dc210.la lib/sane/libsane-dc210.so lib/sane/libsane-dc210.so.1 lib/sane/libsane-dc25.a -lib/sane/libsane-dc25.la lib/sane/libsane-dc25.so lib/sane/libsane-dc25.so.1 lib/sane/libsane-dll.a -lib/sane/libsane-dll.la lib/sane/libsane-dll.so lib/sane/libsane-dll.so.1 lib/sane/libsane-dmc.a -lib/sane/libsane-dmc.la lib/sane/libsane-dmc.so lib/sane/libsane-dmc.so.1 lib/sane/libsane-epson.a -lib/sane/libsane-epson.la lib/sane/libsane-epson.so lib/sane/libsane-epson.so.1 lib/sane/libsane-hp.a -lib/sane/libsane-hp.la lib/sane/libsane-hp.so lib/sane/libsane-hp.so.1 lib/sane/libsane-microtek.a -lib/sane/libsane-microtek.la lib/sane/libsane-microtek.so lib/sane/libsane-microtek.so.1 lib/sane/libsane-microtek2.a -lib/sane/libsane-microtek2.la lib/sane/libsane-microtek2.so lib/sane/libsane-microtek2.so.1 lib/sane/libsane-mustek.a -lib/sane/libsane-mustek.la lib/sane/libsane-mustek.so lib/sane/libsane-mustek.so.1 lib/sane/libsane-net.a -lib/sane/libsane-net.la lib/sane/libsane-net.so lib/sane/libsane-net.so.1 lib/sane/libsane-pnm.a -lib/sane/libsane-pnm.la lib/sane/libsane-pnm.so lib/sane/libsane-pnm.so.1 lib/sane/libsane-ricoh.a -lib/sane/libsane-ricoh.la lib/sane/libsane-ricoh.so lib/sane/libsane-ricoh.so.1 lib/sane/libsane-s9036.a -lib/sane/libsane-s9036.la lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.1 lib/sane/libsane-sharp.a -lib/sane/libsane-sharp.la lib/sane/libsane-sharp.so lib/sane/libsane-sharp.so.1 lib/sane/libsane-snapscan.a -lib/sane/libsane-snapscan.la lib/sane/libsane-snapscan.so lib/sane/libsane-snapscan.so.1 lib/sane/libsane-tamarack.a -lib/sane/libsane-tamarack.la lib/sane/libsane-tamarack.so lib/sane/libsane-tamarack.so.1 lib/sane/libsane-umax.a -lib/sane/libsane-umax.la lib/sane/libsane-umax.so lib/sane/libsane-umax.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
State Changed From-To: open->closed Committed, thanks!