Attachment #4751 for bug #11842

View | Details | Raw Unified | Return to bug 11842 | Differences between

and this patch




# New ports collection makefile for:	sane
# Version required:		1.0.1
# Date created:			Sat Jul 19 16:23:10 MET DST 1997
# Whom:				gary@hotlava.com
#


MAINTAINER=	gary@hotlava.com

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
USE_LIBTOOL=	yes
.if ${OSVERSION} < 300000
CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib" \
		GTK_CONFIG="${GTK_CONFIG}"
.else
CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib -lcam" \
		GTK_CONFIG="${GTK_CONFIG}"
.endif

MAN1=		scanimage.1 \

	@${ECHO} "*** the GIMP and GTK packages/ports."

post-install:
	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
	@${CAT} ${PKGDIR}/MESSAGE

.include <bsd.port.post.mk>




--- 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




--- 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




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

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

Return to bug 11842

Lines 1-5 Link Here

(-)graphics/sane/Makefile (-6 / +7 lines)
1	# New ports collection makefile for: sane	1	# New ports collection makefile for: sane
2	# Version required: 1.00	2	# Version required: 1.0.1
3	# Date created: Sat Jul 19 16:23:10 MET DST 1997	3	# Date created: Sat Jul 19 16:23:10 MET DST 1997
4	# Whom: gary@hotlava.com	4	# Whom: gary@hotlava.com
5	#	5	#
Lines 13-33 Link Here
13		13
14	MAINTAINER= gary@hotlava.com	14	MAINTAINER= gary@hotlava.com
15		15
16	LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \	16	LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
17	jpeg.9:${PORTSDIR}/graphics/jpeg	17	jpeg.9:${PORTSDIR}/graphics/jpeg
18		18
		19	GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
		20
19	.include <bsd.port.pre.mk>	21	.include <bsd.port.pre.mk>
20		22
21	USE_GMAKE= yes	23	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	24	USE_LIBTOOL= yes
23	.if ${OSVERSION} < 300000	25	.if ${OSVERSION} < 300000
24	CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \	26	CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
25	LIBS="-L${LOCALBASE}/lib" \	27	LIBS="-L${LOCALBASE}/lib" \
26	GTK_CONFIG="${X11BASE}/bin/gtk12-config"	28	GTK_CONFIG="${GTK_CONFIG}"
27	.else	29	.else
28	CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
29	LIBS="-L${LOCALBASE}/lib -lcam" \	31	LIBS="-L${LOCALBASE}/lib -lcam" \
30	GTK_CONFIG="${X11BASE}/bin/gtk12-config"	32	GTK_CONFIG="${GTK_CONFIG}"
31	.endif	33	.endif
32		34
33	MAN1= scanimage.1 \	35	MAN1= scanimage.1 \
Lines 58-64 Link Here
58	@${ECHO} "*** the GIMP and GTK packages/ports."	60	@${ECHO} "*** the GIMP and GTK packages/ports."
59		61
60	post-install:	62	post-install:
61	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
62	@${CAT} ${PKGDIR}/MESSAGE	63	@${CAT} ${PKGDIR}/MESSAGE
63		64
64	.include <bsd.port.post.mk>	65	.include <bsd.port.post.mk>

Lines 1-42 Link Here

(-)graphics/sane/patches/patch-02 (-42 lines)
1	--- ltconfig Sat Nov 21 19:53:55 1998
2	+++ ltconfig.new Thu May 13 12:44:40 1999
3	@@ -604,11 +604,11 @@
4	$rm conftestdata
5	if ln -s X conftestdata 2>/dev/null; then
6	$rm conftestdata
7	- LN_S="ln -s"
8	+ LN_S="ln -sf"
9	else
10	LN_S=ln
11	fi
12	- if test "$LN_S" = "ln -s"; then
13	+ if test "$LN_S" = "ln -sf"; then
14	echo "$ac_t"yes 1>&6
15	else
16	echo "$ac_t"no 1>&6
17	@@ -1123,12 +1123,24 @@
18	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'
19	;;
20
21	-freebsd2* \| freebsd3*)
22	+freebsd2*)
23	version_type=sunos
24	library_names_spec='${libname}${release}.so.$versuffix $libname.so'
25	finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
26	shlibpath_var=LD_LIBRARY_PATH
27	;;
28	+
29	+freebsd3* \| freebsd4*)
30	+ version_type=freebsd
31	+ library_names_spec='${libname}${release}.so.$versuffix $libname.so'
32	+ if [ $PORTOBJFORMAT = elf ]; then
33	+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
34	+ else
35	+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
36	+ fi
37	+ shlibpath_var=LD_LIBRARY_PATH
38	+ ;;
39	+
40
41	gnu*)
42	version_type=sunos

Lines 1-20 Link Here

(-)graphics/sane/patches/patch-03 (-20 lines)
1	--- ltmain.sh Mon Nov 2 21:05:05 1998
2	+++ ltmain.sh.new Thu May 13 12:24:53 1999
3	@@ -966,6 +966,17 @@
4	major="$current"
5	versuffix="$current.$revision"
6	;;
7	+ freebsd)
8	+ version_vars="$version_vars major versuffix"
9	+ major="$current"
10	+ if [ $PORTOBJFORMAT = elf ]; then
11	+ versuffix="$current";
12	+ else
13	+ versuffix="$current.$revision";
14	+ fi
15	+ ;;
16	+
17	+
18
19	*)
20	$echo "$modename: unknown library version type \`$version_type'" 1>&2

Lines 19-24 Link Here

(-)graphics/sane/pkg/PLIST (-22 / +4 lines)
19	etc/sane.d/ricoh.conf	19	etc/sane.d/ricoh.conf
20	etc/sane.d/s9036.conf	20	etc/sane.d/s9036.conf
21	etc/sane.d/saned.conf	21	etc/sane.d/saned.conf
		22	etc/sane.d/sharp.conf
22	etc/sane.d/snapscan.conf	23	etc/sane.d/snapscan.conf
23	etc/sane.d/tamarack.conf	24	etc/sane.d/tamarack.conf
24	etc/sane.d/umax.conf	25	etc/sane.d/umax.conf
Lines 37-127 Link Here
37	lib/libsane.so	38	lib/libsane.so
38	lib/libsane.so.1	39	lib/libsane.so.1
39	lib/sane/libsane-abaton.a	40	lib/sane/libsane-abaton.a
40	lib/sane/libsane-abaton.la
41	lib/sane/libsane-abaton.so	41	lib/sane/libsane-abaton.so
42	lib/sane/libsane-abaton.so.1	42	lib/sane/libsane-abaton.so.1
43	lib/sane/libsane-agfafocus.a	43	lib/sane/libsane-agfafocus.a
44	lib/sane/libsane-agfafocus.la
45	lib/sane/libsane-agfafocus.so	44	lib/sane/libsane-agfafocus.so
46	lib/sane/libsane-agfafocus.so.1	45	lib/sane/libsane-agfafocus.so.1
47	lib/sane/libsane-apple.a	46	lib/sane/libsane-apple.a
48	lib/sane/libsane-apple.la
49	lib/sane/libsane-apple.so	47	lib/sane/libsane-apple.so
50	lib/sane/libsane-apple.so.1	48	lib/sane/libsane-apple.so.1
51	lib/sane/libsane-artec.a	49	lib/sane/libsane-artec.a
52	lib/sane/libsane-artec.la
53	lib/sane/libsane-artec.so	50	lib/sane/libsane-artec.so
54	lib/sane/libsane-artec.so.1	51	lib/sane/libsane-artec.so.1
55	lib/sane/libsane-canon.a	52	lib/sane/libsane-canon.a
56	lib/sane/libsane-canon.la
57	lib/sane/libsane-canon.so	53	lib/sane/libsane-canon.so
58	lib/sane/libsane-canon.so.1	54	lib/sane/libsane-canon.so.1
59	lib/sane/libsane-coolscan.a	55	lib/sane/libsane-coolscan.a
60	lib/sane/libsane-coolscan.la
61	lib/sane/libsane-coolscan.so	56	lib/sane/libsane-coolscan.so
62	lib/sane/libsane-coolscan.so.1	57	lib/sane/libsane-coolscan.so.1
63	lib/sane/libsane-dc210.a	58	lib/sane/libsane-dc210.a
64	lib/sane/libsane-dc210.la
65	lib/sane/libsane-dc210.so	59	lib/sane/libsane-dc210.so
66	lib/sane/libsane-dc210.so.1	60	lib/sane/libsane-dc210.so.1
67	lib/sane/libsane-dc25.a	61	lib/sane/libsane-dc25.a
68	lib/sane/libsane-dc25.la
69	lib/sane/libsane-dc25.so	62	lib/sane/libsane-dc25.so
70	lib/sane/libsane-dc25.so.1	63	lib/sane/libsane-dc25.so.1
71	lib/sane/libsane-dll.a	64	lib/sane/libsane-dll.a
72	lib/sane/libsane-dll.la
73	lib/sane/libsane-dll.so	65	lib/sane/libsane-dll.so
74	lib/sane/libsane-dll.so.1	66	lib/sane/libsane-dll.so.1
75	lib/sane/libsane-dmc.a	67	lib/sane/libsane-dmc.a
76	lib/sane/libsane-dmc.la
77	lib/sane/libsane-dmc.so	68	lib/sane/libsane-dmc.so
78	lib/sane/libsane-dmc.so.1	69	lib/sane/libsane-dmc.so.1
79	lib/sane/libsane-epson.a	70	lib/sane/libsane-epson.a
80	lib/sane/libsane-epson.la
81	lib/sane/libsane-epson.so	71	lib/sane/libsane-epson.so
82	lib/sane/libsane-epson.so.1	72	lib/sane/libsane-epson.so.1
83	lib/sane/libsane-hp.a	73	lib/sane/libsane-hp.a
84	lib/sane/libsane-hp.la
85	lib/sane/libsane-hp.so	74	lib/sane/libsane-hp.so
86	lib/sane/libsane-hp.so.1	75	lib/sane/libsane-hp.so.1
87	lib/sane/libsane-microtek.a	76	lib/sane/libsane-microtek.a
88	lib/sane/libsane-microtek.la
89	lib/sane/libsane-microtek.so	77	lib/sane/libsane-microtek.so
90	lib/sane/libsane-microtek.so.1	78	lib/sane/libsane-microtek.so.1
91	lib/sane/libsane-microtek2.a	79	lib/sane/libsane-microtek2.a
92	lib/sane/libsane-microtek2.la
93	lib/sane/libsane-microtek2.so	80	lib/sane/libsane-microtek2.so
94	lib/sane/libsane-microtek2.so.1	81	lib/sane/libsane-microtek2.so.1
95	lib/sane/libsane-mustek.a	82	lib/sane/libsane-mustek.a
96	lib/sane/libsane-mustek.la
97	lib/sane/libsane-mustek.so	83	lib/sane/libsane-mustek.so
98	lib/sane/libsane-mustek.so.1	84	lib/sane/libsane-mustek.so.1
99	lib/sane/libsane-net.a	85	lib/sane/libsane-net.a
100	lib/sane/libsane-net.la
101	lib/sane/libsane-net.so	86	lib/sane/libsane-net.so
102	lib/sane/libsane-net.so.1	87	lib/sane/libsane-net.so.1
103	lib/sane/libsane-pnm.a	88	lib/sane/libsane-pnm.a
104	lib/sane/libsane-pnm.la
105	lib/sane/libsane-pnm.so	89	lib/sane/libsane-pnm.so
106	lib/sane/libsane-pnm.so.1	90	lib/sane/libsane-pnm.so.1
107	lib/sane/libsane-ricoh.a	91	lib/sane/libsane-ricoh.a
108	lib/sane/libsane-ricoh.la
109	lib/sane/libsane-ricoh.so	92	lib/sane/libsane-ricoh.so
110	lib/sane/libsane-ricoh.so.1	93	lib/sane/libsane-ricoh.so.1
111	lib/sane/libsane-s9036.a	94	lib/sane/libsane-s9036.a
112	lib/sane/libsane-s9036.la
113	lib/sane/libsane-s9036.so	95	lib/sane/libsane-s9036.so
114	lib/sane/libsane-s9036.so.1	96	lib/sane/libsane-s9036.so.1
		97	lib/sane/libsane-sharp.a
		98	lib/sane/libsane-sharp.so
		99	lib/sane/libsane-sharp.so.1
115	lib/sane/libsane-snapscan.a	100	lib/sane/libsane-snapscan.a
116	lib/sane/libsane-snapscan.la
117	lib/sane/libsane-snapscan.so	101	lib/sane/libsane-snapscan.so
118	lib/sane/libsane-snapscan.so.1	102	lib/sane/libsane-snapscan.so.1
119	lib/sane/libsane-tamarack.a	103	lib/sane/libsane-tamarack.a
120	lib/sane/libsane-tamarack.la
121	lib/sane/libsane-tamarack.so	104	lib/sane/libsane-tamarack.so
122	lib/sane/libsane-tamarack.so.1	105	lib/sane/libsane-tamarack.so.1
123	lib/sane/libsane-umax.a	106	lib/sane/libsane-umax.a
124	lib/sane/libsane-umax.la
125	lib/sane/libsane-umax.so	107	lib/sane/libsane-umax.so
126	lib/sane/libsane-umax.so.1	108	lib/sane/libsane-umax.so.1
127	@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib	109	@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib