Attachment 4751 Details for Bug 11842 – file.diff

[patch] file.diff

file.diff (text/plain), 6.30 KB, created by reg on 1999-05-23 00:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: reg

Created: 1999-05-23 00:20:01 UTC

Size: 6.30 KB

patch

obsolete

>--- /usr/ports.ref/graphics/sane/Makefile	Sat May 22 14:15:18 1999
>+++ graphics/sane/Makefile	Sat May 22 15:50:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	sane
>-# Version required:		1.00
>+# Version required:		1.0.1
> # Date created:			Sat Jul 19 16:23:10 MET DST 1997
> # Whom:				gary@hotlava.com
> #
>@@ -13,21 +13,23 @@
> 
> MAINTAINER=	gary@hotlava.com
> 
>-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
>+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg
> 
>+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
>+
> .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" \
>-		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
>+		GTK_CONFIG="${GTK_CONFIG}"
> .else
> CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
> 		LIBS="-L${LOCALBASE}/lib -lcam" \
>-		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
>+		GTK_CONFIG="${GTK_CONFIG}"
> .endif
> 
> MAN1=		scanimage.1 \
>@@ -58,7 +60,6 @@
> 	@${ECHO} "*** the GIMP and GTK packages/ports."
> 
> post-install:
>-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
> 	@${CAT} ${PKGDIR}/MESSAGE
> 
> .include <bsd.port.post.mk>
>--- /usr/ports.ref/graphics/sane/patches/patch-02	Sat May 22 14:15:19 1999
>+++ graphics/sane/patches/patch-02	Sat May 22 15:47:08 1999
>@@ -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
>--- /usr/ports.ref/graphics/sane/patches/patch-03	Sat May 22 14:15:19 1999
>+++ graphics/sane/patches/patch-03	Sun May 23 00:47:11 1999
>@@ -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
>--- /usr/ports.ref/graphics/sane/pkg/PLIST	Sun Dec  6 11:37:29 1998
>+++ graphics/sane/pkg/PLIST	Sat May 22 22:39:18 1999
>@@ -19,6 +19,7 @@
> etc/sane.d/ricoh.conf
> etc/sane.d/s9036.conf
> etc/sane.d/saned.conf
>+etc/sane.d/sharp.conf
> etc/sane.d/snapscan.conf
> etc/sane.d/tamarack.conf
> etc/sane.d/umax.conf
>@@ -37,91 +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.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

Actions: View | Diff

Attachments on bug 11842: 4735 | 4736 | 4737 | 4738 | 4739 | 4740 | 4741 | 4742 | 4743 | 4744 | 4745 | 4746 | 4747 | 4748 | 4749 | 4750 | 4751 | 4752 | 4753 | 4754 | 4755 | 4756 | 4757 | 4758 | 4759 | 4760 | 4761 | 4762 | 4763 | 4764 | 4765 | 4766 | 4767 | 4768 | 4769 | 4770 | 4771 | 4772 | 4773 | 4774 | 4775 | 4776 | 4777