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

- Eliminate needless patching

Browse Source 
- Fix pkg-plist

PR: 26332
Submitted by: Ports Fury
This commit is contained in:
Kevin Lo 2001-04-05 15:15:13 +00:00
parent 6fcc65266d
commit 5207f70b22
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=40890
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
graphics/sane-backends/files/patch-backend_Makefile.in
View File

@ -1,37 +0,0 @@
--- backend/Makefile.in.orig Thu Nov 30 20:05:49 2000
+++ backend/Makefile.in Mon Apr 2 09:15:36 2001
@@ -69,7 +69,7 @@
LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS)))
libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
- @$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
+ @$(LIBTOOL) $(MLINK) $(CC) -avoid-version -module -o $@ $($*_LIBS) \
$(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
@@ -99,9 +99,10 @@
@$(LIBTOOL) $(MINST) --finish $(libsanedir)
@# Assume the dll name without any versions is last
@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
- list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
+ list="$(ALL_BACKENDS)"; origdir=`pwd`; \
+ cd $(libsanedir) && for be in $$list; do \
file=libsane-$${be}.$$dllend.$(V_MAJOR); \
- lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
+ lib=`grep dlname= "$$origdir"/libsane-$${be}.la | cut -f2 -d"'"`; \
if test ! -f $${file} -a -n "$${lib}"; then \
$(LN_S) $${lib} $${file}; \
fi; \
@@ -109,10 +110,10 @@
@# Assume the dll name without any versions is last
@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
rm -f $(libdir)/libsane.a $(libdir)/libsane.$$dllend \
- $(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
+ $(libdir)/libsane.$$dllend.$(V_MAJOR); \
$(LN_S) sane/libsane-dll.a $(libdir)/libsane.a; \
$(LN_S) sane/libsane-dll.$$dllend $(libdir)/libsane.$$dllend ; \
- cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
+ cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR); do \
nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
(cd ..; $(LN_S) sane/$$n $$nn); \
done || exit 1

32
graphics/sane-backends/pkg-plist
View File

@ -35,68 +35,100 @@ include/sane/saneopts.h
lib/libsane.a
lib/libsane.so
lib/libsane.so.1
lib/sane/libsane-abaton.a
lib/sane/libsane-abaton.so
lib/sane/libsane-abaton.so.1
lib/sane/libsane-agfafocus.a
lib/sane/libsane-agfafocus.so
lib/sane/libsane-agfafocus.so.1
lib/sane/libsane-apple.a
lib/sane/libsane-apple.so
lib/sane/libsane-apple.so.1
lib/sane/libsane-artec.a
lib/sane/libsane-artec.so
lib/sane/libsane-artec.so.1
lib/sane/libsane-as6e.a
lib/sane/libsane-as6e.so
lib/sane/libsane-as6e.so.1
lib/sane/libsane-avision.a
lib/sane/libsane-avision.so
lib/sane/libsane-avision.so.1
lib/sane/libsane-canon.a
lib/sane/libsane-canon.so
lib/sane/libsane-canon.so.1
lib/sane/libsane-coolscan.a
lib/sane/libsane-coolscan.so
lib/sane/libsane-coolscan.so.1
lib/sane/libsane-dc210.a
lib/sane/libsane-dc210.so
lib/sane/libsane-dc210.so.1
lib/sane/libsane-dc25.a
lib/sane/libsane-dc25.so
lib/sane/libsane-dc25.so.1
lib/sane/libsane-dll.a
lib/sane/libsane-dll.so
lib/sane/libsane-dll.so.1
lib/sane/libsane-dmc.a
lib/sane/libsane-dmc.so
lib/sane/libsane-dmc.so.1
lib/sane/libsane-epson.a
lib/sane/libsane-epson.so
lib/sane/libsane-epson.so.1
lib/sane/libsane-hp.a
lib/sane/libsane-hp.so
lib/sane/libsane-hp.so.1
lib/sane/libsane-m3096g.a
lib/sane/libsane-m3096g.so
lib/sane/libsane-m3096g.so.1
lib/sane/libsane-microtek.a
lib/sane/libsane-microtek.so
lib/sane/libsane-microtek.so.1
lib/sane/libsane-microtek2.a
lib/sane/libsane-microtek2.so
lib/sane/libsane-microtek2.so.1
lib/sane/libsane-mustek.a
lib/sane/libsane-mustek.so
lib/sane/libsane-mustek.so.1
lib/sane/libsane-mustek_pp.a
lib/sane/libsane-mustek_pp.so
lib/sane/libsane-mustek_pp.so.1
lib/sane/libsane-nec.a
lib/sane/libsane-nec.so
lib/sane/libsane-nec.so.1
lib/sane/libsane-net.a
lib/sane/libsane-net.so
lib/sane/libsane-net.so.1
lib/sane/libsane-pie.a
lib/sane/libsane-pie.so
lib/sane/libsane-pie.so.1
lib/sane/libsane-plustek.a
lib/sane/libsane-plustek.so
lib/sane/libsane-plustek.so.1
lib/sane/libsane-pnm.a
lib/sane/libsane-pnm.so
lib/sane/libsane-pnm.so.1
lib/sane/libsane-ricoh.a
lib/sane/libsane-ricoh.so
lib/sane/libsane-ricoh.so.1
lib/sane/libsane-s9036.a
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.so
lib/sane/libsane-snapscan.so.1
lib/sane/libsane-sp15c.a
lib/sane/libsane-sp15c.so
lib/sane/libsane-sp15c.so.1
lib/sane/libsane-st400.a
lib/sane/libsane-st400.so
lib/sane/libsane-st400.so.1
lib/sane/libsane-tamarack.a
lib/sane/libsane-tamarack.so
lib/sane/libsane-tamarack.so.1
lib/sane/libsane-umax.a
lib/sane/libsane-umax.so
lib/sane/libsane-umax.so.1
sbin/saned