Page MenuHomeFreeBSD

print/hplip and print/hplip-plugin: Update to 3.16.8
ClosedPublic

Authored by woodsb02 on Sep 7 2016, 1:48 PM.

Details

Summary

print/hplip and print/hplip-plugin: Update to 3.16.8

print/hplip:

  • Add LICENSE details
  • Changes USE_OPENSSL=yes to USES=ssl
  • Create empty directories for pkg-plist @dir entries
  • Reformat patches with makepatch (pet portlint)

print/hplip-plugin:

  • Re-order LICENSE block (pet portlint)

Changes this release:

http://hplipopensource.com/hplip-web/release_notes.html
Test Plan

poudriere testport: ok on 12amd64
portlint: ok

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

woodsb02 retitled this revision from to print/hplip and print/hplip-plugin: Update to 3.16.8.
woodsb02 updated this object.
woodsb02 edited the test plan for this revision. (Show Details)
woodsb02 added reviewers: adamw, mat, koobs, makc.
print/hplip/Makefile
125 ↗(On Diff #20141)

Can this block be replaced with USES=shebangfix?

print/hplip/pkg-plist
910 ↗(On Diff #20141)

Consider grep -q here instead.

print/hplip/pkg-plist
910–911 ↗(On Diff #20141)

Also, @exec and @unexec are deprecated, use @(pre|post)(exec|unexec) (In that case, maybe postexec and postunexec)

Also, I wonder, the sane.d directory seems like a Debian style "grab me everything in it" kind of directory, couldn't the content be added to another file, and this contraption removed ?

print/hplip/Makefile
125 ↗(On Diff #20141)

Only if we set:
SHEBANG_FILES = *.py \
apparmor/abstractions/hplip \
base/*.py \
data/rules/56-hpmud_sysfs.rules \
data/rules/hplip-printer@.service \
fax/backend/*.py \
fax/filters/pstotiff \
fax/*.py \
hplip-install \
installer/*.py \
prnt/filters/hpps \
scan/*.py \
ui/*.py \
ui4/*.py \
ui5/*.py

Given this is longer, it may not be worth it?

  • Switch to grep -q from grep >/dev/null 2>/dev/null, in pkg-plist
  • Switch to @postexec and @postunexec from @exec and @unexec, in pkg-plist
adamw edited edge metadata.

Looks good from here, though if Mat's assessment of etc/sane.d is correct, it's a much better approach.

This revision is now accepted and ready to land.Sep 7 2016, 3:08 PM
woodsb02 edited edge metadata.
  • Move ${PREFIX}/etc/sane.d/dll.conf to ${PREFIX}/etc/sane.d/dll.d/hpaio during post-install, rather than editing ${PREFIX}/etc/sane.d/dll.conf during @exec and @unexec during pkg-plist
This revision now requires review to proceed.Sep 7 2016, 4:09 PM
adamw edited edge metadata.

Love it. Looks good from here!

This revision is now accepted and ready to land.Sep 7 2016, 4:16 PM
print/hplip/Makefile
130–131 ↗(On Diff #20146)

This should only happen when WITH=SCAN, also, I don't think the dll.conf file is created by this port, otherwise it would not do dirty things in its plist to add and remove a line from it.

print/hplip/Makefile
130–131 ↗(On Diff #20146)

Oh yes, you're right, it should only be done when the SCAN option is enabled.

The dll.conf file is created by the port Makefile. Makefile.am contains the following text:

install-data-hook:
if HPLIP_BUILD
#          If scanner build, add hpaio entry to sane dll.conf.
        if [ "$(scan_build)" = "yes" ]; then \
           $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
           if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
                  touch $(DESTDIR)/etc/sane.d/dll.conf; \
           fi; \
           if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
                  echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
                  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
           fi \
        fi
woodsb02 edited edge metadata.
  • Only install ${PREFIX}/etc/sane.d/dll.d/hpaio when SANE option enabled
This revision now requires review to proceed.Sep 7 2016, 11:28 PM

Waiting for feedback from makc as port maintainer.

print/hplip/Makefile
130–131 ↗(On Diff #20146)

No.

The dll.conf file is created if it does not exist and the line is added to it wether it existed before or not. This is why this is done is postexec/postunexec, so that the dll.conf file is not created in the staging directory and conflicts with the one installed by sane.

Looking at the sane-backends port, the sane.d directory it is not a debian style .d directory, the backends needs to be in the dll.conf file, so you will need to keep the @postexec/@postunexec dance there was before, and the @comment etc/sane.d/dll.conf.

print/hplip/Makefile
130–131 ↗(On Diff #20146)

Hi Mat, since the ${WRKSRC}/Makefile is adding "hpaio" to the dll.conf file in the port staging directory, rather than directly on the system, we know the dll.conf file will not already exist. Therefore it is safe to simply move it to the dll.d folder.

I have just done some testing and confirmed that the scanner is not detected if I comment out the line in dll.d/hpaio, but is detected if the line exists in dll.d/hpaio. Therefore, I believe this does work as a debian style .d directory, and that this is the cleanest solution.

print/hplip/Makefile
130–131 ↗(On Diff #20146)

Hi Mat, since the ${WRKSRC}/Makefile is adding "hpaio" to the dll.conf file in the port staging directory, rather than directly on the system, we know the dll.conf file will not already exist. Therefore it is safe to simply move it to the dll.d folder.

It will not exist in the staging directory as it is empty when installing and the only things that goes in there is what the port puts.
But it *will* exist in LOCALBASE/etc/sane.d, which is why there was the @exec/@unexec tap dance thing.
Now, if putting the line in a file in etc/sane.d/dll.d works, it's fine by me.

This was committed in r422709. Not sure why this differential review was not automatically closed.
https://svnweb.freebsd.org/ports?view=revision&revision=422709

This was committed in r422709. Not sure why this differential review was not automatically closed.
https://svnweb.freebsd.org/ports?view=revision&revision=422709

That's because something's broken, last commit in the ports tree is rP422698, rP422699 is not there yet.

This revision was automatically updated to reflect the committed changes.