- link the hpaio module the same way as other sane backends loadable

modules ; this should allow scanimage(1) to work

issue reported by Stephan Andreas <alfons1991 at arcor dot de> on ports@
This commit is contained in:
ajacoutot 2008-06-05 19:10:43 +00:00
parent f6bb2e414d
commit aebff0d549
3 changed files with 15 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2008/03/15 10:18:29 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.3 2008/06/05 19:10:43 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -8,13 +8,12 @@ COMMENT-docs= html documentation for HPLIP
V= 2.7.12 V= 2.7.12
DISTNAME= hplip-${V} DISTNAME= hplip-${V}
PKGNAME-main= ${DISTNAME} PKGNAME-main= ${DISTNAME}p0
PKGNAME-hpijs= hpijs-${V} PKGNAME-hpijs= hpijs-${V}
PKGNAME-docs= hplip-docs-${V} PKGNAME-docs= hplip-docs-${V}
SHARED_LIBS+= hpmud 0.0 # .0.0 SHARED_LIBS+= hpmud 0.0 # .0.0
SHARED_LIBS+= hpip 0.0 # .0.1 SHARED_LIBS+= hpip 0.0 # .0.1
SHARED_LIBS+= sane-hpaio 0.0 # .1.0
CATEGORIES= print CATEGORIES= print

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/03/15 10:18:30 ajacoutot Exp $ $OpenBSD: patch-Makefile_in,v 1.3 2008/06/05 19:10:43 ajacoutot Exp $
--- Makefile.in.orig Fri Dec 14 23:31:14 2007 --- Makefile.in.orig Fri Dec 14 23:31:14 2007
+++ Makefile.in Fri Mar 7 10:24:29 2008 +++ Makefile.in Thu Jun 5 15:18:29 2008
@@ -1883,7 +1883,7 @@ lib_LTLIBRARIES = $(am__append_4) @@ -1883,7 +1883,7 @@ lib_LTLIBRARIES = $(am__append_4)
@DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse
@DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/* @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
@ -28,6 +28,15 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/03/15 10:18:30 ajacoutot Exp $
@HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
@HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ @HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
@HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \ @HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \
@@ -2000,7 +2000,7 @@ lib_LTLIBRARIES = $(am__append_4)
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/common.c scan/sane/common.h scan/sane/soap.h scan/sane/sanei_debug.h scan/sane/sanei.h \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/soap_stub.c scan/sane/sanei_init_debug.c
-@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 -module -avoid-version
# scan/sane/soap.c scan/sane/webScanC.c scan/sane/webScanClient.c scan/sane/stdsoap2.c \
# scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
@@ -7175,7 +7175,7 @@ install-data-am: install-cupsextLTLIBRARIES install-di @@ -7175,7 +7175,7 @@ install-data-am: install-cupsextLTLIBRARIES install-di
install-dist_localzDATA install-dist_modelsDATA \ install-dist_localzDATA install-dist_modelsDATA \
install-dist_pcardSCRIPTS install-dist_pclDATA \ install-dist_pcardSCRIPTS install-dist_pclDATA \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2008/03/15 10:18:30 ajacoutot Exp $ @comment $OpenBSD: PLIST-main,v 1.3 2008/06/05 19:10:43 ajacoutot Exp $
bin/hp-align bin/hp-align
bin/hp-check bin/hp-check
bin/hp-clean bin/hp-clean
@ -30,7 +30,7 @@ lib/python${MODPY_VERSION}/site-packages/scanext.la
lib/python${MODPY_VERSION}/site-packages/scanext.so lib/python${MODPY_VERSION}/site-packages/scanext.so
lib/sane/ lib/sane/
lib/sane/libsane-hpaio.la lib/sane/libsane-hpaio.la
@lib lib/sane/libsane-hpaio.so.${LIBsane-hpaio_VERSION} lib/sane/libsane-hpaio.so
libexec/cups/ libexec/cups/
libexec/cups/backend/ libexec/cups/backend/
libexec/cups/backend/hp libexec/cups/backend/hp