CVS commit: pkgsrc/print/hpijs

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Oct 12 20:41:11 UTC 2019

Modified Files:
        pkgsrc/print/hpijs: Makefile PLIST

Log Message:
print/hpijs: fix location of HTML documentation


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/hpijs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/hpijs/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/hpijs/Makefile
diff -u pkgsrc/print/hpijs/Makefile:1.31 pkgsrc/print/hpijs/Makefile:1.32
--- pkgsrc/print/hpijs/Makefile:1.31    Sun Apr 26 13:28:23 2015
+++ pkgsrc/print/hpijs/Makefile Sat Oct 12 20:41:11 2019
@@ -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 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 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
 

Index: pkgsrc/print/hpijs/PLIST
diff -u pkgsrc/print/hpijs/PLIST:1.5 pkgsrc/print/hpijs/PLIST:1.6
--- pkgsrc/print/hpijs/PLIST:1.5        Sun Jun 14 18:11:56 2009
+++ pkgsrc/print/hpijs/PLIST    Sat Oct 12 20:41:11 2019
@@ -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