SF.net SVN: gar:[23306] csw/mgar/pkg/hplip/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Tue Apr 1 08:03:57 CEST 2014 

Revision: 23306
          http://sourceforge.net/p/gar/code/23306
Author:   cgrzemba
Date:     2014-04-01 06:03:57 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
hplip/trunk: add configure options, runtime dependencies

Modified Paths:
--------------
    csw/mgar/pkg/hplip/trunk/Makefile
    csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch

Modified: csw/mgar/pkg/hplip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hplip/trunk/Makefile	2014-03-31 18:47:21 UTC (rev 23305)
+++ csw/mgar/pkg/hplip/trunk/Makefile	2014-04-01 06:03:57 UTC (rev 23306)
@@ -16,11 +16,6 @@
 
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
-PACKAGES = CSWhplip
-# OBSOLETED_BY_CSWhplip = CSWhpijs
-SPKG_DESC_CSWhplip = $(DESCRIPTION) Inkjet driver
-RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7
-
 PATCHFILES += 0001-add-strnlen.patch
 PATCHFILES += 0002-set-csw-path-hpijs.cpp.patch
 PATCHFILES += 0004-set-csw-path-foomatic-rip-hplip.patch
@@ -31,6 +26,56 @@
 PATCHFILES += 0009-add-getdomainname-def-HPCupsFilter.cpp.patch
 PATCHFILES += 0010-include-math.h.ErnieFilter.cpp.patch
 
+PACKAGES += CSWlibhpip0
+CATALOGNAME_CSWlibhpip0 = libhpip0
+SPKG_DESC_CSWlibhpip0 += $(DESCRIPTION), libhpip
+PKGFILES_CSWlibhpip0 += $(call baseisadirs,$(libdir),libhpip\.so\.0\.0\.1)
+PKGFILES_CSWlibhpip0 += $(call baseisadirs,$(libdir),libhpip\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibhpip0 += $(DESCRIPTION), libhpip.so.0
+CHECKPKG_OVERRIDES_CSWlibhpip0 += bad-rpath-entry
+
+PACKAGES += CSWlibhpmud0
+CATALOGNAME_CSWlibhpmud0 = libhpmud0
+SPKG_DESC_CSWlibhpmud0 += $(DESCRIPTION), libhpmud
+PKGFILES_CSWlibhpmud0 += $(call baseisadirs,$(libdir),libhpmud\.so\.0\.0\.6)
+PKGFILES_CSWlibhpmud0 += $(call baseisadirs,$(libdir),libhpmud\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibhpmud0 += $(DESCRIPTION), libhpmud.so.0
+# need /usr/sfw/lib/libusb.so
+CHECKPKG_OVERRIDES_CSWlibhpmud0 += bad-rpath-entry
+
+PACKAGES += CSWhplip-dev
+CATALOGNAME_CSWhplip-dev = hplip_dev
+SPKG_DESC_CSWhplip-dev += $(DESCRIPTION), development files
+PKGFILES_CSWhplip-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWhplip-dev += CSWlibhpmud0
+RUNTIME_DEP_PKGS_CSWhplip-dev += CSWlibhpip0
+
+PACKAGES += CSWhplip
+# OBSOLETED_BY_CSWhplip = CSWhpijs
+SPKG_DESC_CSWhplip = $(DESCRIPTION) Inkjet driver
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibcupsimage2
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibsane1
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibhpmud0
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibhpip0
+CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html
+CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html
+CHECKPKG_OVERRIDES_CSWhplip += bad-rpath-entry
+CHECKPKG_OVERRIDES_CSWhplip += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWhplip += catalogname-does-not-start-with-py_
+
+
+# not interested in dll.conf
+EXTRA_MERGE_EXCLUDE_FILES += /etc/sane.d.*
+# not interested in 56-hpmud.rules
+EXTRA_MERGE_EXCLUDE_FILES += /etc/udev.*
+# not interested in systemd stuff
+EXTRA_MERGE_EXCLUDE_FILES += /usr/lib.*
+# not interested in hal stuff
+EXTRA_MERGE_EXCLUDE_FILES += /usr/share.*
+
 EXTRA_LINKER_FLAGS_SOS12U3 += -norunpath -xnorunpath
 EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GARCOMPILER))
 EXTRA_INC += /usr/sfw/include
@@ -38,6 +83,7 @@
 EXTRA_CPPFLAGS_SOS12U3 += -features=extensions
 EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS_$(GARCOMPILER))
 STRIP_LIBTOOL = 1
+EXTRAC_CONFIGURE_ENV += hplip_confdir=$(sysconfdir)/hp
 
 CONFIGURE_ARGS = $(DIRPATHS)
 # CONFIGURE_ARGS += --enable-hpijs-only-build
@@ -49,10 +95,13 @@
 # CONFIGURE_ARGS += --disable-gui-build
 # CONFIGURE_ARGS += --disable-fax-build
 CONFIGURE_ARGS += --enable-libusb01_build
+CONFIGURE_ARGS += --with-systraydir=$(sysconfdir)/xdg/autostart
+CONFIGURE_ARGS += --with-icondir=$(datadir)/icons/hp
+CONFIGURE_ARGS +=  --with-mimedir=$(sysconfdir)/cups
+CONFIGURE_ARGS +=  --with-cupsbackenddir=$(libdir)/cups/backend
+CONFIGURE_ARGS +=  --with-cupsfilterdir=$(libdir)/cups/filter
+CONFIGURE_ARGS +=  --with-drvdir=$(libdir)/cups/drv/hp
 
-CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html
-CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html
-
 include gar/category.mk
 
 post-install:

Modified: csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch	2014-03-31 18:47:21 UTC (rev 23305)
+++ csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch	2014-04-01 06:03:57 UTC (rev 23306)
@@ -9,8 +9,6 @@
  @HPLIP_BUILD_TRUE at am_libhpmud_la_rpath = -rpath $(libdir)
  am__DEPENDENCIES_1 =
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_DEPENDENCIES =  \
---- a/Makefile.in
-+++ b/Makefile.in
 @@ -346,7 +346,7 @@ am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c \
  libsane_hpaio_la_OBJECTS = $(am_libsane_hpaio_la_OBJECTS)
  libsane_hpaio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -20,8 +18,6 @@
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at am_libsane_hpaio_la_rpath = -rpath \
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	$(libsane_hpaiodir)
  pcardext_la_LIBADD =
---- a/Makefile.in
-+++ b/Makefile.in
 @@ -366,7 +366,7 @@ am__scanext_la_SOURCES_DIST = scan/scanext/scanext.c
  scanext_la_OBJECTS = $(am_scanext_la_OBJECTS)
  scanext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -31,3 +27,21 @@
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at am_scanext_la_rpath =  \
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	-rpath \
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	$(scanextdir)
+@@ -4449,7 +4449,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @HPLIP_BUILD_TRUE at dist_halpre_DATA = data/rules/20-hplip-devices.fdi
+ 
+ # hplip.conf
+- at HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
++ at HPLIP_BUILD_TRUE@hplip_confdir = /etc/opt/csw/hp
+ @HPLIP_BUILD_TRUE at hplip_conf_DATA = hplip.conf
+ 
+ #pstotiff filter
+@@ -4457,7 +4457,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @HPLIP_BUILD_TRUE at pstotiff_SCRIPTS = fax/filters/pstotiff
+ 
+ # hplip.state
+- at HPLIP_BUILD_TRUE@hplip_statedir = /var/lib/hp
++ at HPLIP_BUILD_TRUE@hplip_statedir = /var/opt/csw/lib/hp
+ @HPLIP_BUILD_TRUE at dist_hplip_state_DATA = 
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at cmddir = $(hplipdir)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list