From 9eda29de0720eef472f8156eb3a49f184055b7df Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Mon, 22 Jan 2024 15:13:16 +0100 Subject: [PATCH] print/psutils: Sanitize MANPREFIX Approved by: portmgr (blanket) --- print/psutils/Makefile | 3 +- print/psutils/files/patch-Makefile.unix | 2 +- print/psutils/pkg-plist | 40 ++++++++++++------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/print/psutils/Makefile b/print/psutils/Makefile index 0eefd8c50cac9..80fa2a1933196 100644 --- a/print/psutils/Makefile +++ b/print/psutils/Makefile @@ -1,6 +1,6 @@ PORTNAME= psutils PORTVERSION= 1.17 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \ ftp://ftp.knackered.org/pub/psutils/ \ @@ -28,7 +28,6 @@ MAKE_ENV+= CHMOD="${CHMOD}" \ PERL="${PERL}" SCRIPTS_ENV+= CC=${CC} \ DATADIR=${DATADIR} \ - MANPREFIX=${MANPREFIX} \ PAPER=dummy \ PERL5=${PERL} diff --git a/print/psutils/files/patch-Makefile.unix b/print/psutils/files/patch-Makefile.unix index 84765f6f552d5..fd97b5c5def99 100644 --- a/print/psutils/files/patch-Makefile.unix +++ b/print/psutils/files/patch-Makefile.unix @@ -22,7 +22,7 @@ INSTALLMAN = install -c -m $(MANMODE) MANEXT = 1 -MANDIR = /usr/local/share/man/man$(MANEXT) -+MANDIR ?= $(DESTDIR)$(MANPREFIX)/man/man$(MANEXT) ++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man/man$(MANEXT) -CC = gcc -CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall diff --git a/print/psutils/pkg-plist b/print/psutils/pkg-plist index cac8b35139c33..912813a6f06e2 100644 --- a/print/psutils/pkg-plist +++ b/print/psutils/pkg-plist @@ -19,25 +19,25 @@ bin/extractres bin/includeres bin/psmerge bin/showchar -man/man1/epsffit.1.gz -man/man1/extractres.1.gz -man/man1/fixdlsrps.1.gz -man/man1/fixfmps.1.gz -man/man1/fixmacps.1.gz -man/man1/fixpsditps.1.gz -man/man1/fixpspps.1.gz -man/man1/fixscribeps.1.gz -man/man1/fixtpps.1.gz -man/man1/fixwfwps.1.gz -man/man1/fixwpps.1.gz -man/man1/fixwwps.1.gz -man/man1/getafm.1.gz -man/man1/includeres.1.gz -man/man1/psbook.1.gz -man/man1/psmerge.1.gz -man/man1/psnup.1.gz -man/man1/psresize.1.gz -man/man1/psselect.1.gz -man/man1/pstops.1.gz +share/man/man1/epsffit.1.gz +share/man/man1/extractres.1.gz +share/man/man1/fixdlsrps.1.gz +share/man/man1/fixfmps.1.gz +share/man/man1/fixmacps.1.gz +share/man/man1/fixpsditps.1.gz +share/man/man1/fixpspps.1.gz +share/man/man1/fixscribeps.1.gz +share/man/man1/fixtpps.1.gz +share/man/man1/fixwfwps.1.gz +share/man/man1/fixwpps.1.gz +share/man/man1/fixwwps.1.gz +share/man/man1/getafm.1.gz +share/man/man1/includeres.1.gz +share/man/man1/psbook.1.gz +share/man/man1/psmerge.1.gz +share/man/man1/psnup.1.gz +share/man/man1/psresize.1.gz +share/man/man1/psselect.1.gz +share/man/man1/pstops.1.gz %%DATADIR%%/md68_0.ps %%DATADIR%%/md71_0.ps