cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix modules names

Browse Source 
- Better dependencies for -gphoto FLAVOR
- Bump PKGNAME
This commit is contained in:
alek 2005-10-04 21:42:38 +00:00
parent 23299668b8
commit f6534cb730
5 changed files with 95 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/sane-backends/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/10/03 21:15:04 alek Exp $
# $OpenBSD: Makefile,v 1.2 2005/10/04 21:42:38 alek Exp $
COMMENT= "API for accessing scanners, backends"
DISTNAME= sane-backends-1.0.16
PKGNAME= ${DISTNAME}p0
CATEGORIES= graphics
HOMEPAGE= http://www.sane-project.org/
@ -42,6 +43,7 @@ FLAVOR?=
LIB_DEPENDS+= gphoto2,gphoto2_port::graphics/libgphoto2
CONFIGURE_ARGS+=--with-gphoto2
WANTLIB+= exif
MODULES= devel/gettext
.else
CONFIGURE_ARGS+=--without-gphoto2
.endif
@ -51,7 +53,7 @@ NO_REGRESS= Yes
MKFILES= lib/Makefile.in sanei/Makefile.in backend/Makefile.in \
frontend/Makefile.in tools/Makefile.in japi/Makefile.in
post-patch:
pre-build:
.for i in ${MKFILES}
perl -pi -e "s,\.\.\/libtool,${LIBTOOL},g" ${WRKSRC}/${i}
.endfor

35
graphics/sane-backends/patches/patch-backend_Makefile
View File

@ -1,5 +1,5 @@
--- backend/Makefile.in.orig Sat Jul 30 14:28:10 2005
+++ backend/Makefile.in Sun Sep 18 17:05:02 2005
+++ backend/Makefile.in Tue Oct 4 14:09:44 2005
@@ -25,7 +25,7 @@ infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
@ -9,26 +9,13 @@
BEOS_ADDONDIR = @BEOS_ADDONDIR@
V_MAJOR = @V_MAJOR@
@@ -197,14 +197,14 @@ install-be:
done
@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libsanedir)
# @# Assume the dll name without any versions is last
-# @dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-# list="$(ALL_BACKENDS)"; cd $(DESTDIR)$(libsanedir) && for be in $$list; do \
-# file=libsane-$${be}.$$dllend.$(V_MAJOR); \
-# lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
-# if test ! -f $${file} -a -n "$${lib}"; then \
-# $(LN_S) $${lib} $${file}; \
-# fi; \
-# done
+ @dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
+ list="$(ALL_BACKENDS)"; cd $(DESTDIR)$(libsanedir) && for be in $$list; do \
+ file=libsane-$${be}.$$dllend.$(V_MAJOR); \
+ lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
+ if test ! -f $${file} -a -n "$${lib}"; then \
+ $(LN_S) $${lib} $${file}; \
+ fi; \
+ done
# @# Assume the dll name without any versions is last
# @dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
# rm -f $(DESTDIR)$(libdir)/libsane.a $(DESTDIR)$(libdir)/libsane.$$dllend \
@@ -168,7 +168,8 @@ DISTFILES = abaton.c abaton.conf abaton.
libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
$(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
- -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG) \
+ -avoid-version
%-s.lo: %-s.c
@$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<

21
graphics/sane-backends/patches/patch-backend_dll_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-backend_dll_c,v 1.1 2005/10/04 21:42:38 alek Exp $
--- backend/dll.c.orig Tue Oct 4 12:05:45 2005
+++ backend/dll.c Tue Oct 4 12:06:06 2005
@@ -391,7 +391,7 @@ load (struct backend *be)
# define PREFIX ""
# define POSTFIX ".dll"
# else
-# define POSTFIX ".so.%u"
+# define POSTFIX ".so"
# endif
mode = getenv ("LD_BIND_NOW") ? RTLD_NOW : RTLD_LAZY;
#elif defined(HAVE_SHL_LOAD)
@@ -453,7 +453,7 @@ load (struct backend *be)
(be->name)+2, V_MAJOR);
#else
snprintf (libname, sizeof (libname), "%s/" PREFIX "%s" POSTFIX,
- dir, be->name, V_MAJOR);
+ dir, be->name);
#endif
DBG (4, "load: trying to load `%s'\n", libname);
fp = fopen (libname, "r");

170
graphics/sane-backends/pkg/PFRAG.shared
View File

@ -1,114 +1,58 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/10/03 21:15:04 alek Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/10/04 21:42:39 alek Exp $
@lib lib/libsane.so.1.16
@comment lib/sane/libsane-abaton.so.1
@lib lib/sane/libsane-abaton.so.1.16
@comment lib/sane/libsane-agfafocus.so.1
@lib lib/sane/libsane-agfafocus.so.1.16
@comment lib/sane/libsane-apple.so.1
@lib lib/sane/libsane-apple.so.1.16
@comment lib/sane/libsane-artec.so.1
@lib lib/sane/libsane-artec.so.1.16
@comment lib/sane/libsane-artec_eplus48u.so.1
@lib lib/sane/libsane-artec_eplus48u.so.1.16
@comment lib/sane/libsane-as6e.so.1
@lib lib/sane/libsane-as6e.so.1.16
@comment lib/sane/libsane-avision.so.1
@lib lib/sane/libsane-avision.so.1.16
@comment lib/sane/libsane-bh.so.1
@lib lib/sane/libsane-bh.so.1.16
@comment lib/sane/libsane-canon.so.1
@lib lib/sane/libsane-canon.so.1.16
@comment lib/sane/libsane-canon630u.so.1
@lib lib/sane/libsane-canon630u.so.1.16
@comment lib/sane/libsane-coolscan.so.1
@lib lib/sane/libsane-coolscan.so.1.16
@comment lib/sane/libsane-coolscan2.so.1
@lib lib/sane/libsane-coolscan2.so.1.16
@comment lib/sane/libsane-dc210.so.1
@lib lib/sane/libsane-dc210.so.1.16
@comment lib/sane/libsane-dc240.so.1
@lib lib/sane/libsane-dc240.so.1.16
@comment lib/sane/libsane-dc25.so.1
@lib lib/sane/libsane-dc25.so.1.16
@comment lib/sane/libsane-dll.so.1
@lib lib/sane/libsane-dll.so.1.16
@comment lib/sane/libsane-dmc.so.1
@lib lib/sane/libsane-dmc.so.1.16
@comment lib/sane/libsane-epson.so.1
@lib lib/sane/libsane-epson.so.1.16
@comment lib/sane/libsane-fujitsu.so.1
@lib lib/sane/libsane-fujitsu.so.1.16
@comment lib/sane/libsane-genesys.so.1
@lib lib/sane/libsane-genesys.so.1.16
@comment lib/sane/libsane-gt68xx.so.1
@lib lib/sane/libsane-gt68xx.so.1.16
@comment lib/sane/libsane-hp.so.1
@lib lib/sane/libsane-hp.so.1.16
@comment lib/sane/libsane-hp5400.so.1
@lib lib/sane/libsane-hp5400.so.1.16
@comment lib/sane/libsane-ibm.so.1
@lib lib/sane/libsane-ibm.so.1.16
@comment lib/sane/libsane-leo.so.1
@lib lib/sane/libsane-leo.so.1.16
@comment lib/sane/libsane-ma1509.so.1
@lib lib/sane/libsane-ma1509.so.1.16
@comment lib/sane/libsane-matsushita.so.1
@lib lib/sane/libsane-matsushita.so.1.16
@comment lib/sane/libsane-microtek.so.1
@lib lib/sane/libsane-microtek.so.1.16
@comment lib/sane/libsane-microtek2.so.1
@lib lib/sane/libsane-microtek2.so.1.16
@comment lib/sane/libsane-mustek.so.1
@lib lib/sane/libsane-mustek.so.1.16
@comment lib/sane/libsane-mustek_usb.so.1
@lib lib/sane/libsane-mustek_usb.so.1.16
@comment lib/sane/libsane-nec.so.1
@lib lib/sane/libsane-nec.so.1.16
@comment lib/sane/libsane-net.so.1
@lib lib/sane/libsane-net.so.1.16
@comment lib/sane/libsane-niash.so.1
@lib lib/sane/libsane-niash.so.1.16
@comment lib/sane/libsane-pie.so.1
@lib lib/sane/libsane-pie.so.1.16
@comment lib/sane/libsane-pint.so.1
@lib lib/sane/libsane-pint.so.1.16
@comment lib/sane/libsane-plustek.so.1
@lib lib/sane/libsane-plustek.so.1.16
@comment lib/sane/libsane-plustek_pp.so.1
@lib lib/sane/libsane-plustek_pp.so.1.16
@comment lib/sane/libsane-ricoh.so.1
@lib lib/sane/libsane-ricoh.so.1.16
@comment lib/sane/libsane-s9036.so.1
@lib lib/sane/libsane-s9036.so.1.16
@comment lib/sane/libsane-sceptre.so.1
@lib lib/sane/libsane-sceptre.so.1.16
@comment lib/sane/libsane-sharp.so.1
@lib lib/sane/libsane-sharp.so.1.16
@comment lib/sane/libsane-sm3600.so.1
@lib lib/sane/libsane-sm3600.so.1.16
@comment lib/sane/libsane-sm3840.so.1
@lib lib/sane/libsane-sm3840.so.1.16
@comment lib/sane/libsane-snapscan.so.1
@lib lib/sane/libsane-snapscan.so.1.16
@comment lib/sane/libsane-sp15c.so.1
@lib lib/sane/libsane-sp15c.so.1.16
@comment lib/sane/libsane-st400.so.1
@lib lib/sane/libsane-st400.so.1.16
@comment lib/sane/libsane-tamarack.so.1
@lib lib/sane/libsane-tamarack.so.1.16
@comment lib/sane/libsane-teco1.so.1
@lib lib/sane/libsane-teco1.so.1.16
@comment lib/sane/libsane-teco2.so.1
@lib lib/sane/libsane-teco2.so.1.16
@comment lib/sane/libsane-teco3.so.1
@lib lib/sane/libsane-teco3.so.1.16
@comment lib/sane/libsane-test.so.1
@lib lib/sane/libsane-test.so.1.16
@comment lib/sane/libsane-u12.so.1
@lib lib/sane/libsane-u12.so.1.16
@comment lib/sane/libsane-umax.so.1
@lib lib/sane/libsane-umax.so.1.16
@comment lib/sane/libsane-umax1220u.so.1
@lib lib/sane/libsane-umax1220u.so.1.16
@comment lib/sane/libsane-umax_pp.so.1
@lib lib/sane/libsane-umax_pp.so.1.16
lib/sane/libsane-abaton.so
lib/sane/libsane-agfafocus.so
lib/sane/libsane-apple.so
lib/sane/libsane-artec.so
lib/sane/libsane-artec_eplus48u.so
lib/sane/libsane-as6e.so
lib/sane/libsane-avision.so
lib/sane/libsane-bh.so
lib/sane/libsane-canon.so
lib/sane/libsane-canon630u.so
lib/sane/libsane-coolscan.so
lib/sane/libsane-coolscan2.so
lib/sane/libsane-dc210.so
lib/sane/libsane-dc240.so
lib/sane/libsane-dc25.so
lib/sane/libsane-dll.so
lib/sane/libsane-dmc.so
lib/sane/libsane-epson.so
lib/sane/libsane-fujitsu.so
lib/sane/libsane-genesys.so
lib/sane/libsane-gt68xx.so
lib/sane/libsane-hp.so
lib/sane/libsane-hp5400.so
lib/sane/libsane-ibm.so
lib/sane/libsane-leo.so
lib/sane/libsane-ma1509.so
lib/sane/libsane-matsushita.so
lib/sane/libsane-microtek.so
lib/sane/libsane-microtek2.so
lib/sane/libsane-mustek.so
lib/sane/libsane-mustek_usb.so
lib/sane/libsane-nec.so
lib/sane/libsane-net.so
lib/sane/libsane-niash.so
lib/sane/libsane-pie.so
lib/sane/libsane-pint.so
lib/sane/libsane-plustek.so
lib/sane/libsane-plustek_pp.so
lib/sane/libsane-ricoh.so
lib/sane/libsane-s9036.so
lib/sane/libsane-sceptre.so
lib/sane/libsane-sharp.so
lib/sane/libsane-sm3600.so
lib/sane/libsane-sm3840.so
lib/sane/libsane-snapscan.so
lib/sane/libsane-sp15c.so
lib/sane/libsane-st400.so
lib/sane/libsane-tamarack.so
lib/sane/libsane-teco1.so
lib/sane/libsane-teco2.so
lib/sane/libsane-teco3.so
lib/sane/libsane-test.so
lib/sane/libsane-u12.so
lib/sane/libsane-umax.so
lib/sane/libsane-umax1220u.so
lib/sane/libsane-umax_pp.so

5
graphics/sane-backends/pkg/PFRAG.shared-gphoto2
View File

@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.shared-gphoto2,v 1.1.1.1 2005/10/03 21:15:04 alek Exp $
@lib lib/sane/libsane${FLAVOR_EXT}.so.1.16
@comment lib/sane/libsane${FLAVOR_EXT}.so.1
@comment $OpenBSD: PFRAG.shared-gphoto2,v 1.2 2005/10/04 21:42:39 alek Exp $
lib/sane/libsane${FLAVOR_EXT}.so