CVS commit: pkgsrc/devel/pccts

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May 31 12:05:52 UTC 2021

Modified Files:
        pkgsrc/devel/pccts: Makefile distinfo
        pkgsrc/devel/pccts/patches: patch-aa patch-ab patch-ac patch-ad

Log Message:
pccts: Honor LDFLAGS and CFLAGS.

Set LICENSE.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/pccts/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/pccts/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/pccts/patches/patch-aa \
    pkgsrc/devel/pccts/patches/patch-ac pkgsrc/devel/pccts/patches/patch-ad
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/pccts/patches/patch-ab

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

Modified files:

Index: pkgsrc/devel/pccts/Makefile
diff -u pkgsrc/devel/pccts/Makefile:1.22 pkgsrc/devel/pccts/Makefile:1.23
--- pkgsrc/devel/pccts/Makefile:1.22    Thu Oct  9 14:06:30 2014
+++ pkgsrc/devel/pccts/Makefile Mon May 31 12:05:52 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:30 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.23 2021/05/31 12:05:52 wiz Exp $
 
 DISTNAME=      pccts133mr33
 PKGNAME=       pccts-1.33.33
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://www.polhode.com/
 EXTRACT_SUFX=  .zip
@@ -10,28 +10,29 @@ EXTRACT_SUFX=       .zip
 MAINTAINER=    david%maxwell.net@localhost
 HOMEPAGE=      http://www.polhode.com/pccts.html
 COMMENT=       Purdue Compiler Construction Tool Set
+LICENSE=       public-domain
 
 WRKSRC=                ${WRKDIR}/pccts
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 
 MAKE_FILE=     makefile
+MAKE_FLAGS+=   COPT=${CFLAGS:Q}
+MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 BUILD_TARGET=
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/doc/pccts include/pccts
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/antlr ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/dlg ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/genmk ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/sor ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/pccts
        ${INSTALL_MAN} ${WRKSRC}/CHANGES_FROM_131.txt \
                ${WRKSRC}/CHANGES_FROM_133.txt \
                ${WRKSRC}/CHANGES_FROM_133_BEFORE_MR13.txt \
                ${WRKSRC}/KNOWN_PROBLEMS.txt \
                ${WRKSRC}/RIGHTS ${WRKSRC}/history.txt \
                ${DESTDIR}${PREFIX}/share/doc/pccts/
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/pccts
        ${INSTALL_MAN} ${WRKSRC}/h/*.h ${DESTDIR}${PREFIX}/include/pccts/
        ${INSTALL_MAN} ${WRKSRC}/h/*.c ${DESTDIR}${PREFIX}/include/pccts/
        ${INSTALL_MAN} ${WRKSRC}/h/*.cpp ${DESTDIR}${PREFIX}/include/pccts/

Index: pkgsrc/devel/pccts/distinfo
diff -u pkgsrc/devel/pccts/distinfo:1.8 pkgsrc/devel/pccts/distinfo:1.9
--- pkgsrc/devel/pccts/distinfo:1.8     Tue Nov  3 03:29:01 2015
+++ pkgsrc/devel/pccts/distinfo Mon May 31 12:05:52 2021
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 03:29:01 agc Exp $
+$NetBSD: distinfo,v 1.9 2021/05/31 12:05:52 wiz Exp $
 
 SHA1 (pccts-1.33.33/pccts133mr33.zip) = 5b3417efd5f537434b568114bcda853b4975d851
 RMD160 (pccts-1.33.33/pccts133mr33.zip) = 46a0955aedb263d196dae0054f6249d42b2ac835
 SHA512 (pccts-1.33.33/pccts133mr33.zip) = 8d01433df1502f5c1f6258d5ebb4dc2296239c179b4b62ba016fd890138045069222ff07b948aa194002a00a413a08bb939ab9879ab3821be4c1be61818b3458
 Size (pccts-1.33.33/pccts133mr33.zip) = 738635 bytes
-SHA1 (patch-aa) = 8100e31c4a504efbb27fda047cf4345fcf88df4d
-SHA1 (patch-ab) = 2244e82c6915c2abbb55bbcbafc8df6e835f7e6c
-SHA1 (patch-ac) = 393d5af26e911a845f8f323722e9b70b8f059848
-SHA1 (patch-ad) = 7df54b2b9810ff3c50300b4caf09e43a9f5403fe
+SHA1 (patch-aa) = 497f3613c996b8f431d71c84329fb3a1f3577aac
+SHA1 (patch-ab) = 444269f84c206d5abece7784b3082ce4573b1fe5
+SHA1 (patch-ac) = 81f160fd21d309c867f046f583bb7bd45ad829d9
+SHA1 (patch-ad) = a7bd3f225c04362b0e66b2b761f6a5516bda5179
 SHA1 (patch-ae) = bdfbc276cbf7217bdf48bb1b6df787d61f1d6267
 SHA1 (patch-af) = 5910279eb5d9d216c1051c48038792fc3841c568
 SHA1 (patch-ag) = 6637240de0c79b4f41f34d658ed99001adeab539

Index: pkgsrc/devel/pccts/patches/patch-aa
diff -u pkgsrc/devel/pccts/patches/patch-aa:1.3 pkgsrc/devel/pccts/patches/patch-aa:1.4
--- pkgsrc/devel/pccts/patches/patch-aa:1.3     Fri Mar 11 14:49:03 2011
+++ pkgsrc/devel/pccts/patches/patch-aa Mon May 31 12:05:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2011/03/11 14:49:03 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2021/05/31 12:05:52 wiz Exp $
 
 --- antlr/makefile.orig        2000-09-10 00:56:56.000000000 +0000
 +++ antlr/makefile
@@ -13,3 +13,12 @@ $NetBSD: patch-aa,v 1.3 2011/03/11 14:49
  ANTLR=../bin/antlr
  DLG=../bin/dlg
  OBJ_EXT=o
+@@ -179,7 +179,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o 
+         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o
+ 
+ antlr : $(OBJ) $(SRC)
+-              $(CC) $(CFLAGS) -o antlr $(OBJ)
++              $(CC) $(CFLAGS) $(LDFLAGS) -o antlr $(OBJ)
+               mv antlr ../bin/.
+ 
+ # what files does PCCTS generate (both ANTLR and DLG)
Index: pkgsrc/devel/pccts/patches/patch-ac
diff -u pkgsrc/devel/pccts/patches/patch-ac:1.3 pkgsrc/devel/pccts/patches/patch-ac:1.4
--- pkgsrc/devel/pccts/patches/patch-ac:1.3     Fri Mar 11 14:49:03 2011
+++ pkgsrc/devel/pccts/patches/patch-ac Mon May 31 12:05:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2011/03/11 14:49:03 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2021/05/31 12:05:52 wiz Exp $
 
 --- sorcerer/makefile.orig     2001-04-13 00:43:59.000000000 +0000
 +++ sorcerer/makefile
@@ -13,3 +13,12 @@ $NetBSD: patch-ac,v 1.3 2011/03/11 14:49
  CFLAGS = $(COPT) -Ih -I. -I$(PCCTS_H) -I$(SET) -DZZLEXBUFSIZE=32000
  AFLAGS = -gh -k 2 -gt
  DFLAGS = -C2
+@@ -25,7 +25,7 @@ all:
+       (cd ./lib; $(MAKE) CC="$(CC)" COPT="$(COPT)")
+ 
+ sor: $(OBJ) $(SRC)
+-      $(CC) -o sor $(CFLAGS) $(OBJ)
++      $(CC) $(LDFLAGS) -o sor $(CFLAGS) $(OBJ)
+       mv sor $(BIN)/.
+ 
+ sor.o : sor.c mode.h tokens.h
Index: pkgsrc/devel/pccts/patches/patch-ad
diff -u pkgsrc/devel/pccts/patches/patch-ad:1.3 pkgsrc/devel/pccts/patches/patch-ad:1.4
--- pkgsrc/devel/pccts/patches/patch-ad:1.3     Fri Mar 11 14:49:03 2011
+++ pkgsrc/devel/pccts/patches/patch-ad Mon May 31 12:05:52 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2011/03/11 14:49:03 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2021/05/31 12:05:52 wiz Exp $
 
 --- support/genmk/makefile.orig        2000-09-10 01:14:18.000000000 +0000
 +++ support/genmk/makefile
-@@ -7,8 +7,8 @@ SRC=genmk.c
+@@ -7,14 +7,14 @@ SRC=genmk.c
  OBJ=genmk.o
  # Define PC if you use a PC OS (changes directory symbol and object file extension)
  # see pccts/h/pcctscfg.h
@@ -13,3 +13,10 @@ $NetBSD: patch-ad,v 1.3 2011/03/11 14:49
  #CFLAGS=-I../../h -DPC
  CFLAGS=$(COPT) -I../../h
  BAG=../../bin/bag
+ 
+ genmk: $(OBJ) $(SRC) ../../h/pcctscfg.h
+-      $(CC) -o genmk $(OBJ)
++      $(CC) $(LDFLAGS) -o genmk $(OBJ)
+ 
+ clean:
+       rm -rf core *.o

Index: pkgsrc/devel/pccts/patches/patch-ab
diff -u pkgsrc/devel/pccts/patches/patch-ab:1.4 pkgsrc/devel/pccts/patches/patch-ab:1.5
--- pkgsrc/devel/pccts/patches/patch-ab:1.4     Fri Mar 11 14:49:03 2011
+++ pkgsrc/devel/pccts/patches/patch-ab Mon May 31 12:05:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2011/03/11 14:49:03 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2021/05/31 12:05:52 wiz Exp $
 
 --- dlg/makefile.orig  2000-09-10 00:57:05.000000000 +0000
 +++ dlg/makefile
@@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.4 2011/03/11 14:49
  ANTLR=../bin/antlr
  DLG=../bin/dlg
  CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=32000
+@@ -125,7 +125,7 @@ OBJ = dlg_p.o dlg_a.o main.o err.o set.o
+         relabel.o automata.o
+ 
+ dlg : $(OBJ) $(SRC)
+-              $(CC) $(CFLAGS) -o dlg $(OBJ)
++              $(CC) $(CFLAGS) $(LDFLAGS) -o dlg $(OBJ)
+               mv dlg ../bin/.
+ 
+ SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \