diff options
| -rw-r--r-- | editor/Makefile | 7 | ||||
| -rwxr-xr-x | editor/pnmcat | 34 |
2 files changed, 6 insertions, 35 deletions
diff --git a/editor/Makefile b/editor/Makefile index c97a797c..3fe8cb05 100644 --- a/editor/Makefile +++ b/editor/Makefile @@ -45,7 +45,7 @@ NOMERGEBINARIES = MERGEBINARIES = $(PORTBINARIES) BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) -SCRIPTS = ppmbrighten pnmcat pnmflip ppmfade ppmquant ppmshadow \ +SCRIPTS = ppmbrighten pnmflip ppmfade ppmquant ppmshadow \ pamstretch-gen pnmmargin pnmquant pnmquantall OBJECTS = $(BINARIES:%=%.o) @@ -101,6 +101,10 @@ install.bin.local: $(PKGDIR)/bin cd $(PKGDIR)/bin ; \ rm -f pnmcomp$(EXE) ; \ $(SYMLINK) pamcomp$(EXE) pnmcomp$(EXE) +# In August 2022, pamcat replaced pnmcat + cd $(PKGDIR)/bin ; \ + rm -f pnmcat$(EXE) ; \ + $(SYMLINK) pamcat$(EXE) pnmcat$(EXE) mergecomptrylist: cat /dev/null >$@ @@ -112,4 +116,5 @@ mergecomptrylist: echo "TRY(\"pnmcut\", main_pamcut);" >>$@ echo "TRY(\"pnmscale\", main_pamscale);" >>$@ echo "TRY(\"pnmcomp\", main_pamcomp);" >>$@ + echo "TRY(\"pnmcat\", main_pamcomp);" >>$@ diff --git a/editor/pnmcat b/editor/pnmcat deleted file mode 100755 index 4893720c..00000000 --- a/editor/pnmcat +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh - -plainopt="" -quietopt="" -pamcatopts="" - -# Parse args. -while true ; do - case "$1" in - -v|--v|-version|--version ) - pamcat --version; exit $?; - ;; - -p|-pl|-pla|-plai|-plain|--p|--pl|--pla|--plai|--plain ) - plainopt="-plain" - shift - ;; - -q|-qu|-qui|-quie|-quiet|--q|--qu|--qui|--quie|--quiet ) - quietopt="-quiet" - shift - ;; - "" ) - break - ;; - * ) - pamcatargs=${pamcatargs}" $1" - shift - ;; - esac - done - -pamcat -extendplane ${pamcatargs} ${quietopt} | \ - pamtopnm --assume ${plainopt} ${quietopt} - - |