CVS commit: pkgsrc/print/adobeps-win

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 20 08:31:55 UTC 2023

Modified Files:
        pkgsrc/print/adobeps-win: Makefile

Log Message:
adobeps-win: fix extraction step

Fix some pkglint while here


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/print/adobeps-win/Makefile

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

Modified files:

Index: pkgsrc/print/adobeps-win/Makefile
diff -u pkgsrc/print/adobeps-win/Makefile:1.17 pkgsrc/print/adobeps-win/Makefile:1.18
--- pkgsrc/print/adobeps-win/Makefile:1.17      Tue Aug  1 17:40:15 2017
+++ pkgsrc/print/adobeps-win/Makefile   Mon Feb 20 08:31:55 2023
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.17 2017/08/01 17:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2023/02/20 08:31:55 wiz Exp $
 
 DISTNAME=      winsteng
 PKGNAME=       adobeps-win-1.0.6
 PKGREVISION=   5
 CATEGORIES=    print
 MASTER_SITES=  ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/1.x/
+DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_SUFX=  .exe
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.adobe.com/products/printerdrivers/windows.html
 COMMENT=       Adobe PostScript MS Windows drivers for CUPS/Samba
 
-BUILD_DEPENDS+=        cabextract-[0-9]*:../../archivers/cabextract
+TOOL_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
 DEPENDS+=      cups>=1.1.15:../../print/cups
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
 WRKSRC=                ${WRKDIR}
-EXTRACT_CMD=   ${LOCALBASE}/bin/cabextract $$extract_file
+EXTRACT_CMD=   ${PREFIX}/bin/cabextract $$extract_file
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
@@ -26,6 +26,12 @@ DRIVERDIR=   ${PREFIX}/share/cups/drivers
 
 INSTALLATION_DIRS=     ${DRIVERDIR}
 
+# bug in cabextract?
+pre-extract:
+       ${MKDIR} ${WRKSRC}/WinNT
+       ${MKDIR} ${WRKSRC}/Win2000
+       ${MKDIR} ${WRKSRC}/WinXP
+
 post-extract:
        cd ${WRKSRC}; for dir in WinNT Windows; do                      \
                ( cd $$dir; for file in *; do                           \