cusp-base: Do not inject DSTROOT, now the package successfully install

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Nov 17 21:40:39 2019 +0100
Changeset:	8706d2aa694756f1e2c72ac0c70df080f5ec09f3

Modified Files:
	cups-base/Makefile
	cups-base/PLIST
Removed Files:
	cups-base/TODO

Log Message:
cusp-base: Do not inject DSTROOT, now the package successfully install

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8706d2aa694756f1e2c72ac0c70df080f5ec09f3

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

diffstat:
 cups-base/Makefile |  1 -
 cups-base/PLIST    | 95 +++++++++++++++++++++++++++---------------------------
 cups-base/TODO     | 11 -------
 3 files changed, 47 insertions(+), 60 deletions(-)

diffs:
diff --git a/cups-base/Makefile b/cups-base/Makefile
index 9bafdc169b..b48d79c944 100644
--- a/cups-base/Makefile
+++ b/cups-base/Makefile
@@ -129,7 +129,6 @@ SUBST_STAGE.piefix=	pre-configure
 .endif
 
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR}
-INSTALL_ENV+=		DSTROOT=${DESTDIR}
 
 pre-configure:
 .if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
diff --git a/cups-base/PLIST b/cups-base/PLIST
index 8ea971fb20..adc13c0f31 100644
--- a/cups-base/PLIST
+++ b/cups-base/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD: PLIST,v 1.3 2018/11/10 19:51:12 leot Exp $
 bin/cancel
 bin/cups-config
-bin/cupstestdsc
 bin/cupstestppd
+bin/ippeveprinter
 ${PLIST.ippfind}bin/ippfind
 bin/ipptool
 bin/lp
@@ -52,6 +52,8 @@ libexec/cups/cgi-bin/classes.cgi
 libexec/cups/cgi-bin/help.cgi
 libexec/cups/cgi-bin/jobs.cgi
 libexec/cups/cgi-bin/printers.cgi
+libexec/cups/command/ippevepcl
+libexec/cups/command/ippeveps
 libexec/cups/daemon/cups-deviced
 libexec/cups/daemon/cups-driverd
 libexec/cups/daemon/cups-exec
@@ -59,7 +61,6 @@ libexec/cups/daemon/cups-lpd
 libexec/cups/filter/commandtops
 libexec/cups/filter/gziptoany
 libexec/cups/filter/pstops
-libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
 libexec/cups/filter/rastertohp
 libexec/cups/filter/rastertolabel
@@ -72,8 +73,8 @@ libexec/cups/notifier/rss
 man/man1/cancel.1
 man/man1/cups-config.1
 man/man1/cups.1
-man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
+man/man1/ippeveprinter.1
 ${PLIST.ippfind}man/man1/ippfind.1
 man/man1/ipptool.1
 man/man1/lp.1
@@ -102,15 +103,15 @@ man/man5/printers.conf.5
 man/man5/subscriptions.conf.5
 man/man7/backend.7
 man/man7/filter.7
+man/man7/ippevepcl.7
+man/man7/ippeveps.7
 man/man7/notifier.7
-man/man8/accept.8
 man/man8/cups-deviced.8
 man/man8/cups-driverd.8
 man/man8/cups-exec.8
 man/man8/cups-lpd.8
 man/man8/cups-snmp.8
 man/man8/cupsaccept.8
-man/man8/cupsaddsmb.8
 man/man8/cupsctl.8
 man/man8/cupsd-helper.8
 man/man8/cupsd.8
@@ -122,10 +123,7 @@ man/man8/lpadmin.8
 man/man8/lpc.8
 man/man8/lpinfo.8
 man/man8/lpmove.8
-man/man8/reject.8
-sbin/accept
 sbin/cupsaccept
-sbin/cupsaddsmb
 sbin/cupsctl
 sbin/cupsd
 sbin/cupsdisable
@@ -136,7 +134,6 @@ sbin/lpadmin
 sbin/lpc
 sbin/lpinfo
 sbin/lpmove
-sbin/reject
 share/cups/drv/sample.drv
 share/cups/examples/color.drv
 share/cups/examples/constraint.drv
@@ -149,30 +146,66 @@ share/cups/examples/postscript.drv
 share/cups/examples/r300-basic.drv
 share/cups/examples/r300-colorman.drv
 share/cups/examples/r300-remote.drv
+share/cups/ipptool/cancel-current-job.test
 share/cups/ipptool/color.jpg
+share/cups/ipptool/create-job-format.test
+share/cups/ipptool/create-job-sheets.test
+share/cups/ipptool/create-job-timeout.test
+share/cups/ipptool/create-job.test
 share/cups/ipptool/create-printer-subscription.test
+share/cups/ipptool/cups-create-local-printer.test
 share/cups/ipptool/document-a4.pdf
 share/cups/ipptool/document-a4.ps
 share/cups/ipptool/document-letter.pdf
 share/cups/ipptool/document-letter.ps
+share/cups/ipptool/fax-job.test
 share/cups/ipptool/get-completed-jobs.test
+share/cups/ipptool/get-devices.test
+share/cups/ipptool/get-job-attributes.test
+share/cups/ipptool/get-job-attributes2.test
+share/cups/ipptool/get-job-template-attributes.test
 share/cups/ipptool/get-jobs.test
 share/cups/ipptool/get-notifications.test
+share/cups/ipptool/get-ppd-printer.test
+share/cups/ipptool/get-ppd.test
+share/cups/ipptool/get-ppds-drv-only.test
+share/cups/ipptool/get-ppds-language.test
+share/cups/ipptool/get-ppds-make-and-model.test
+share/cups/ipptool/get-ppds-make.test
+share/cups/ipptool/get-ppds-product.test
+share/cups/ipptool/get-ppds-psversion.test
+share/cups/ipptool/get-ppds.test
+share/cups/ipptool/get-printer-attributes-suite.test
 share/cups/ipptool/get-printer-attributes.test
+share/cups/ipptool/get-printer-description-attributes.test
+share/cups/ipptool/get-printers-printer-id.test
+share/cups/ipptool/get-printers.test
 share/cups/ipptool/get-subscriptions.test
 share/cups/ipptool/gray.jpg
+share/cups/ipptool/identify-printer-display.test
+share/cups/ipptool/identify-printer-multiple.test
+share/cups/ipptool/identify-printer.test
 share/cups/ipptool/ipp-1.1.test
 share/cups/ipptool/ipp-2.0.test
 share/cups/ipptool/ipp-2.1.test
 share/cups/ipptool/ipp-2.2.test
+share/cups/ipptool/ipp-backend.test
 share/cups/ipptool/ipp-everywhere.test
 share/cups/ipptool/onepage-a4.pdf
 share/cups/ipptool/onepage-a4.ps
 share/cups/ipptool/onepage-letter.pdf
 share/cups/ipptool/onepage-letter.ps
+share/cups/ipptool/print-job-and-wait.test
 share/cups/ipptool/print-job-deflate.test
 share/cups/ipptool/print-job-gzip.test
+share/cups/ipptool/print-job-hold.test
+share/cups/ipptool/print-job-letter.test
+share/cups/ipptool/print-job-manual.test
+share/cups/ipptool/print-job-media-col.test
+share/cups/ipptool/print-job-password.test
 share/cups/ipptool/print-job.test
+share/cups/ipptool/print-uri.test
+share/cups/ipptool/set-attrs-hold.test
 share/cups/ipptool/testfile.jpg
 share/cups/ipptool/testfile.pcl
 share/cups/ipptool/testfile.pdf
@@ -189,7 +222,6 @@ share/cups/ppdc/media.defs
 share/cups/ppdc/raster.defs
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
-share/cups/templates/add-rss-subscription.tmpl
 share/cups/templates/admin.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
@@ -207,7 +239,6 @@ share/cups/templates/classes.tmpl
 share/cups/templates/command.tmpl
 share/cups/templates/de/add-class.tmpl
 share/cups/templates/de/add-printer.tmpl
-share/cups/templates/de/add-rss-subscription.tmpl
 share/cups/templates/de/admin.tmpl
 share/cups/templates/de/choose-device.tmpl
 share/cups/templates/de/choose-make.tmpl
@@ -265,13 +296,9 @@ share/cups/templates/de/printer.tmpl
 share/cups/templates/de/printers-header.tmpl
 share/cups/templates/de/printers.tmpl
 share/cups/templates/de/restart.tmpl
-share/cups/templates/de/samba-export.tmpl
-share/cups/templates/de/samba-exported.tmpl
 share/cups/templates/de/search.tmpl
 share/cups/templates/de/set-printer-options-header.tmpl
 share/cups/templates/de/set-printer-options-trailer.tmpl
-share/cups/templates/de/subscription-added.tmpl
-share/cups/templates/de/subscription-canceled.tmpl
 share/cups/templates/de/test-page.tmpl
 share/cups/templates/de/trailer.tmpl
 share/cups/templates/de/users.tmpl
@@ -280,7 +307,6 @@ share/cups/templates/error-op.tmpl
 share/cups/templates/error.tmpl
 share/cups/templates/es/add-class.tmpl
 share/cups/templates/es/add-printer.tmpl
-share/cups/templates/es/add-rss-subscription.tmpl
 share/cups/templates/es/admin.tmpl
 share/cups/templates/es/choose-device.tmpl
 share/cups/templates/es/choose-make.tmpl
@@ -338,19 +364,14 @@ share/cups/templates/es/printer.tmpl
 share/cups/templates/es/printers-header.tmpl
 share/cups/templates/es/printers.tmpl
 share/cups/templates/es/restart.tmpl
-share/cups/templates/es/samba-export.tmpl
-share/cups/templates/es/samba-exported.tmpl
 share/cups/templates/es/search.tmpl
 share/cups/templates/es/set-printer-options-header.tmpl
 share/cups/templates/es/set-printer-options-trailer.tmpl
-share/cups/templates/es/subscription-added.tmpl
-share/cups/templates/es/subscription-canceled.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
 share/cups/templates/es/users.tmpl
 share/cups/templates/fr/add-class.tmpl
 share/cups/templates/fr/add-printer.tmpl
-share/cups/templates/fr/add-rss-subscription.tmpl
 share/cups/templates/fr/admin.tmpl
 share/cups/templates/fr/choose-device.tmpl
 share/cups/templates/fr/choose-make.tmpl
@@ -408,13 +429,9 @@ share/cups/templates/fr/printer.tmpl
 share/cups/templates/fr/printers-header.tmpl
 share/cups/templates/fr/printers.tmpl
 share/cups/templates/fr/restart.tmpl
-share/cups/templates/fr/samba-export.tmpl
-share/cups/templates/fr/samba-exported.tmpl
 share/cups/templates/fr/search.tmpl
 share/cups/templates/fr/set-printer-options-header.tmpl
 share/cups/templates/fr/set-printer-options-trailer.tmpl
-share/cups/templates/fr/subscription-added.tmpl
-share/cups/templates/fr/subscription-canceled.tmpl
 share/cups/templates/fr/test-page.tmpl
 share/cups/templates/fr/trailer.tmpl
 share/cups/templates/fr/users.tmpl
@@ -424,7 +441,6 @@ share/cups/templates/help-printable.tmpl
 share/cups/templates/help-trailer.tmpl
 share/cups/templates/ja/add-class.tmpl
 share/cups/templates/ja/add-printer.tmpl
-share/cups/templates/ja/add-rss-subscription.tmpl
 share/cups/templates/ja/admin.tmpl
 share/cups/templates/ja/choose-device.tmpl
 share/cups/templates/ja/choose-make.tmpl
@@ -482,13 +498,9 @@ share/cups/templates/ja/printer.tmpl
 share/cups/templates/ja/printers-header.tmpl
 share/cups/templates/ja/printers.tmpl
 share/cups/templates/ja/restart.tmpl
-share/cups/templates/ja/samba-export.tmpl
-share/cups/templates/ja/samba-exported.tmpl
 share/cups/templates/ja/search.tmpl
 share/cups/templates/ja/set-printer-options-header.tmpl
 share/cups/templates/ja/set-printer-options-trailer.tmpl
-share/cups/templates/ja/subscription-added.tmpl
-share/cups/templates/ja/subscription-canceled.tmpl
 share/cups/templates/ja/test-page.tmpl
 share/cups/templates/ja/trailer.tmpl
 share/cups/templates/ja/users.tmpl
@@ -528,7 +540,6 @@ share/cups/templates/printers-header.tmpl
 share/cups/templates/printers.tmpl
 share/cups/templates/pt_BR/add-class.tmpl
 share/cups/templates/pt_BR/add-printer.tmpl
-share/cups/templates/pt_BR/add-rss-subscription.tmpl
 share/cups/templates/pt_BR/admin.tmpl
 share/cups/templates/pt_BR/choose-device.tmpl
 share/cups/templates/pt_BR/choose-make.tmpl
@@ -586,20 +597,15 @@ share/cups/templates/pt_BR/printer.tmpl
 share/cups/templates/pt_BR/printers-header.tmpl
 share/cups/templates/pt_BR/printers.tmpl
 share/cups/templates/pt_BR/restart.tmpl
-share/cups/templates/pt_BR/samba-export.tmpl
-share/cups/templates/pt_BR/samba-exported.tmpl
 share/cups/templates/pt_BR/search.tmpl
 share/cups/templates/pt_BR/set-printer-options-header.tmpl
 share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
-share/cups/templates/pt_BR/subscription-added.tmpl
-share/cups/templates/pt_BR/subscription-canceled.tmpl
 share/cups/templates/pt_BR/test-page.tmpl
 share/cups/templates/pt_BR/trailer.tmpl
 share/cups/templates/pt_BR/users.tmpl
 share/cups/templates/restart.tmpl
 share/cups/templates/ru/add-class.tmpl
 share/cups/templates/ru/add-printer.tmpl
-share/cups/templates/ru/add-rss-subscription.tmpl
 share/cups/templates/ru/admin.tmpl
 share/cups/templates/ru/choose-device.tmpl
 share/cups/templates/ru/choose-make.tmpl
@@ -657,23 +663,15 @@ share/cups/templates/ru/printer.tmpl
 share/cups/templates/ru/printers-header.tmpl
 share/cups/templates/ru/printers.tmpl
 share/cups/templates/ru/restart.tmpl
-share/cups/templates/ru/samba-export.tmpl
-share/cups/templates/ru/samba-exported.tmpl
 share/cups/templates/ru/search.tmpl
 share/cups/templates/ru/set-printer-options-header.tmpl
 share/cups/templates/ru/set-printer-options-trailer.tmpl
-share/cups/templates/ru/subscription-added.tmpl
-share/cups/templates/ru/subscription-canceled.tmpl
 share/cups/templates/ru/test-page.tmpl
 share/cups/templates/ru/trailer.tmpl
 share/cups/templates/ru/users.tmpl
-share/cups/templates/samba-export.tmpl
-share/cups/templates/samba-exported.tmpl
 share/cups/templates/search.tmpl
 share/cups/templates/set-printer-options-header.tmpl
 share/cups/templates/set-printer-options-trailer.tmpl
-share/cups/templates/subscription-added.tmpl
-share/cups/templates/subscription-canceled.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
 share/cups/templates/users.tmpl
@@ -686,6 +684,7 @@ share/doc/cups/cups.css
 share/doc/cups/de/index.html
 share/doc/cups/es/index.html
 share/doc/cups/help/accounting.html
+share/doc/cups/help/admin.html
 share/doc/cups/help/api-admin.html
 share/doc/cups/help/api-filter.html
 share/doc/cups/help/api-ppd.html
@@ -693,6 +692,7 @@ share/doc/cups/help/api-raster.html
 share/doc/cups/help/cgi.html
 share/doc/cups/help/cupspm.html
 share/doc/cups/help/encryption.html
+share/doc/cups/help/firewalls.html
 share/doc/cups/help/glossary.html
 share/doc/cups/help/kerberos.html
 share/doc/cups/help/license.html
@@ -706,15 +706,15 @@ share/doc/cups/help/man-cups-lpd.html
 share/doc/cups/help/man-cups-snmp.html
 share/doc/cups/help/man-cups.html
 share/doc/cups/help/man-cupsaccept.html
-share/doc/cups/help/man-cupsaddsmb.html
 share/doc/cups/help/man-cupsd-helper.html
 share/doc/cups/help/man-cupsd-logs.html
 share/doc/cups/help/man-cupsd.conf.html
 share/doc/cups/help/man-cupsd.html
 share/doc/cups/help/man-cupsenable.html
-share/doc/cups/help/man-cupstestdsc.html
 share/doc/cups/help/man-cupstestppd.html
 share/doc/cups/help/man-filter.html
+share/doc/cups/help/man-ippevepcl.html
+share/doc/cups/help/man-ippeveprinter.html
 share/doc/cups/help/man-ipptool.html
 share/doc/cups/help/man-ipptoolfile.html
 share/doc/cups/help/man-lp.html
@@ -751,8 +751,6 @@ share/doc/cups/help/spec-banner.html
 share/doc/cups/help/spec-command.html
 share/doc/cups/help/spec-design.html
 share/doc/cups/help/spec-ipp.html
-share/doc/cups/help/spec-pdf.html
-share/doc/cups/help/spec-postscript.html
 share/doc/cups/help/spec-ppd.html
 share/doc/cups/help/spec-raster.html
 share/doc/cups/help/spec-stp.html
@@ -786,6 +784,7 @@ share/examples/cups/snmp.conf
 share/locale/ca/cups_ca.po
 share/locale/cs/cups_cs.po
 share/locale/de/cups_de.po
+share/locale/en/cups_en.po
 share/locale/es/cups_es.po
 share/locale/fr/cups_fr.po
 share/locale/it/cups_it.po
diff --git a/cups-base/TODO b/cups-base/TODO
deleted file mode 100644
index b511120e0f..0000000000
--- a/cups-base/TODO
+++ /dev/null
@@ -1,11 +0,0 @@
-The installation (`make install') fails with:
-
- Installing programs in templates...
- set -e; for file in LICENSE README.md; do                        /usr/bin/install -c -o user -g users -m 644 /tmp/pkgsrc/wip/cups-base/work/cups-2.3.0/${file}                   /tmp/pkgsrc/wip/cups-base/work/.destdir/usr/pkg/share/doc/cups/${file};  done
- /bin/chmod g-w /tmp/pkgsrc/wip/cups-base/work/.destdir/usr/pkg/libexec/cups/cgi-bin
- chmod: /tmp/pkgsrc/wip/cups-base/work/.destdir/usr/pkg/libexec/cups/cgi-bin: No such file or directory
- *** Error code 1
-
-...and the DESTDIR isn't properly populated...
-Probably that's related to (now wrong) `INSTALL_ENV+= DSTROOT=${DESTDIR}'...
-Investigate further and fix.