[pkgsrc/trunk]: pkgsrc/print/hpijs print/hpijs: fix location of HTML document...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0cd7ac8a54ab
branches:  trunk
changeset: 341028:0cd7ac8a54ab
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 12 20:41:11 2019 +0000

description:
print/hpijs: fix location of HTML documentation

diffstat:

 print/hpijs/Makefile |  20 ++++++++++----------
 print/hpijs/PLIST    |   6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (55 lines):

diff -r f51350d3ace2 -r 0cd7ac8a54ab print/hpijs/Makefile
--- a/print/hpijs/Makefile      Sat Oct 12 20:31:37 2019 +0000
+++ b/print/hpijs/Makefile      Sat Oct 12 20:41:11 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2015/04/26 13:28:23 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/12 20:41:11 rillig Exp $
 
 DISTNAME=      hpijs-2.1.4
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
 
@@ -9,19 +9,19 @@
 HOMEPAGE=      http://hpinkjet.sourceforge.net/
 COMMENT=       HP inkjet printer driver server
 
-CONFLICTS=     ghostscript<=6.01nb4 ghostscript-nox11<=6.01nb4
+CONFLICTS=     ghostscript<=6.01nb4
+CONFLICTS+=    ghostscript-nox11<=6.01nb4
 
-USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         yes
-CPPFLAGS+=             -DAPDK_BUFFER_SEND
-
-USE_TOOLS+=            gzip
-INSTALLATION_DIRS=     bin share/ppd share/doc/html/hpijs
+USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+CPPFLAGS+=     -DAPDK_BUFFER_SEND
+USE_TOOLS+=    gzip
+AUTO_MKDIRS=   yes
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/hpijs ${DESTDIR}${PREFIX}/bin/hpijs
        cd ${WRKSRC} && ${INSTALL_DATA} hpijs_readme.html gs_hpijs.png \
-                ${DESTDIR}${PREFIX}/share/doc/html/hpijs/
+                ${DESTDIR}${PREFIX}/share/doc/hpijs/
        ${INSTALL_DATA} ${WRKSRC}/ppd/HP* ${DESTDIR}${PREFIX}/share/ppd/
        ${GZIP_CMD} ${DESTDIR}${PREFIX}/share/ppd/HP*.ppd
 
diff -r f51350d3ace2 -r 0cd7ac8a54ab print/hpijs/PLIST
--- a/print/hpijs/PLIST Sat Oct 12 20:31:37 2019 +0000
+++ b/print/hpijs/PLIST Sat Oct 12 20:41:11 2019 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:11:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/10/12 20:41:11 rillig Exp $
 bin/hpijs
-share/doc/html/hpijs/gs_hpijs.png
-share/doc/html/hpijs/hpijs_readme.html
+share/doc/hpijs/gs_hpijs.png
+share/doc/hpijs/hpijs_readme.html
 share/ppd/HP-2000C-hpijs.ppd.gz
 share/ppd/HP-2500C-hpijs.ppd.gz
 share/ppd/HP-2500CM-hpijs.ppd.gz