cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

print/lout: Update to 3.42.1

Browse Source
This commit is contained in:
Kevin Bowling 2022-08-07 12:41:46 -07:00
parent 6be85b66de
commit 04affee44f
4 changed files with 610 additions and 780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
print/lout/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= lout
PORTVERSION= 3.42
PORTVERSION= 3.42.1
CATEGORIES= print
MAINTAINER= kbowling@FreeBSD.org

6
print/lout/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1646603360
SHA256 (william8000-lout-3.42_GH0.tar.gz) = 971c37b39e6613731c2b8e46d729b65dcc2f2897d0bb7a9bd4d6700dba801169
SIZE (william8000-lout-3.42_GH0.tar.gz) = 1675172
TIMESTAMP = 1659900065
SHA256 (william8000-lout-3.42.1_GH0.tar.gz) = b0b2f66a0f959bc80835966c69ae4d4eef2cb0def2b03e634bf1c7e55b1fe6dd
SIZE (william8000-lout-3.42.1_GH0.tar.gz) = 1675266

182
print/lout/files/patch-makefile
View File

@ -1,4 +1,4 @@
--- makefile.orig 2020-12-28 00:45:43 UTC
--- makefile.orig 2021-12-21 18:09:56 UTC
+++ makefile
@@ -275,15 +275,15 @@ TRACING =
#TRACING = -g -fno-omit-frame-pointer -fsanitize=address -fsanitize-recover
@ -11,17 +11,15 @@
#LOUTDOCDIR = $(PREFIX)/lout.doc
#MANDIR = $(PREFIX)/lout.man
-LIBDIR = $(PREFIX)/share/lout-$(VERSION)
-LOUTLIBDIR = $(LIBDIR)/lib
-LOUTDOCDIR = $(LIBDIR)/doc
+LIBDIR = $(PREFIX)/share/lout
LOUTLIBDIR = $(LIBDIR)/lib
LOUTDOCDIR = $(LIBDIR)/doc
-MANDIR = $(LIBDIR)/man
+LIBDIR = $(PREFIX)/share
+LOUTLIBDIR = $(LIBDIR)/lout
+LOUTDOCDIR = $(LIBDIR)/doc/lout
+MANDIR = $(PREFIX)/man/man1
LIBFONT = font
LIBMAPS = maps
@@ -295,29 +295,29 @@ CHAROUT = 0
@@ -295,20 +295,20 @@ CHAROUT = 0
CHARIN = 1
CHAROUT = 0
@ -39,7 +37,7 @@
ZLIBPATH =
-CC = gcc
+#CC = gcc
+CC = cc
#CC = bgcc
-RCOPY = cp -r
@ -47,171 +45,3 @@
MKDIR = mkdir -p
# Add WARN to COPTS for more checking
WARN = -Wpointer-arith -Wclobbered -Wempty-body -Wmissing-parameter-type -Wmissing-field-initializers -Wold-style-declaration -Wtype-limits -Wuninitialized -Winit-self -Wlogical-op -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wbad-function-cast
-COPTS = -ansi -pedantic -Wall -O3 -pipe
+#COPTS = -ansi -pedantic -Wall -O3 -pipe
-CFLAGS = -DOS_UNIX=$(OSUNIX) \
+CFLAGS += -DOS_UNIX=$(OSUNIX) \
-DOS_DOS=$(OSDOS) \
-DOS_MAC=$(OSMAC) \
-DDB_FIX=$(DBFIX) \
@@ -365,96 +365,98 @@ install: lout prg2lout
install: lout prg2lout
@echo ""
@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
- cp lout $(BINDIR)/lout
- chmod 755 $(BINDIR)/lout
- cp prg2lout $(BINDIR)/prg2lout
- chmod 755 $(BINDIR)/prg2lout
+ install -c -s lout $(DESTDIR)$(BINDIR)/lout
+ install -c -s prg2lout $(DESTDIR)$(BINDIR)/prg2lout
@echo ""
@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
- $(MKDIR) $(LOUTLIBDIR)
- chmod 755 $(LOUTLIBDIR)
+ mkdir $(DESTDIR)$(LOUTLIBDIR)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)
@echo ""
- $(MKDIR) $(LOUTLIBDIR)/$(LIBINCL)
- chmod 755 $(LOUTLIBDIR)/$(LIBINCL)
- cp include/* $(LOUTLIBDIR)/$(LIBINCL)
- chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)
+ cp include/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/*
@echo ""
- $(MKDIR) $(LOUTLIBDIR)/$(LIBDATA)
- chmod 755 $(LOUTLIBDIR)/$(LIBDATA)
- cp data/* $(LOUTLIBDIR)/$(LIBDATA)
- chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
+ cp data/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)/*
@echo ""
- $(MKDIR) $(LOUTLIBDIR)/$(LIBHYPH)
- chmod 755 $(LOUTLIBDIR)/$(LIBHYPH)
- cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
- chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)
+ cp hyph/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)/*
@echo ""
- $(MKDIR) $(LOUTLIBDIR)/$(LIBFONT)
- chmod 755 $(LOUTLIBDIR)/$(LIBFONT)
- cp font/* $(LOUTLIBDIR)/$(LIBFONT)
- chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)
+ cp font/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)/*
@echo ""
- $(MKDIR) $(LOUTLIBDIR)/$(LIBMAPS)
- chmod 755 $(LOUTLIBDIR)/$(LIBMAPS)
- cp maps/* $(LOUTLIBDIR)/$(LIBMAPS)
- chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)
+ cp maps/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)/*
@echo ""
- $(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA)
- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)
+ touch $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/.place_holder
@echo ""
@echo "(c) Initializing run (should be silent, no errors expected)"
- $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init -I $(LOUTLIBDIR)/$(LIBINCL) -H $(LOUTLIBDIR)/$(LIBHYPH) -D $(LOUTLIBDIR)/$(LIBDATA)
+ $(DESTDIR)$(BINDIR)/lout -s -x -D $(DESTDIR)$(LOUTLIBDIR)/data \
+ -H $(DESTDIR)$(LOUTLIBDIR)/hyph \
+ -I $(DESTDIR)$(LOUTLIBDIR)/include \
+ $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/init
@echo ""
@echo "(d) Changing mode of files just created by initializing run"
- chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
- chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)/*
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)/*
installman:
@echo ""
@echo "Installing manual entries into MANDIR $(MANDIR)"
- if [ ! -d $(MANDIR) ] ; then $(MKDIR) $(MANDIR) ; fi
- chmod 755 $(MANDIR)
+ if [ ! -d $(DESTDIR)$(MANDIR) ] ; then $(MKDIR) $(DESTDIR)$(MANDIR) ; fi
+ chmod 755 $(DESTDIR)$(MANDIR)
sed -e "s@<BINDIR>@$(BINDIR)@" -e "s@<LIBDIR>@$(LOUTLIBDIR)@" \
-e "s@<LOUTDOCDIR>@$(LOUTDOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@" \
- man/lout.1 > $(MANDIR)/lout.1
- chmod 644 $(MANDIR)/lout.1
- cp man/prg2lout.1 $(MANDIR)/prg2lout.1
- chmod 644 $(MANDIR)/prg2lout.1
+ man/lout.1 > $(DESTDIR)$(MANDIR)/lout.1
+ chmod 644 $(DESTDIR)$(MANDIR)/lout.1
+ cp man/prg2lout.1 $(DESTDIR)$(MANDIR)/prg2lout.1
+ chmod 644 $(DESTDIR)$(MANDIR)/prg2lout.1
installdoc:
@echo ""
@echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it"
- if [ ! -d $(LOUTDOCDIR) ] ; then $(MKDIR) $(LOUTDOCDIR) ; fi
- $(RCOPY) doc/* $(LOUTDOCDIR)
- chmod 755 $(LOUTDOCDIR)
- chmod 755 $(LOUTDOCDIR)/*
- chmod 644 $(LOUTDOCDIR)/*/*
+ if [ ! -d $(DESTDIR)$(LOUTDOCDIR) ] ; then $(MKDIR) $(DESTDIR)$(LOUTDOCDIR) ; fi
+ $(RCOPY) doc/* $(DESTDIR)$(LOUTDOCDIR)
+ chmod 755 $(DESTDIR)$(LOUTDOCDIR)
+ chmod 755 $(DESTDIR)$(LOUTDOCDIR)/*
+ chmod 644 $(DESTDIR)$(LOUTDOCDIR)/*/*
allinstall: install installman installdoc
installfr:
@echo ""
@echo "Putting French error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)"
- $(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
- $(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
- cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
- gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \
- $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
- chmod 644 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+ cp locale/msgs.fr $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+ gencat $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \
+ $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
installde:
@echo ""
@echo "Putting German error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)"
- $(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
- $(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
- cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
- gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \
- $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
- chmod 644 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
+ mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+ cp locale/msgs.de $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
+ gencat $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \
+ $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
+ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
uninstall:
-rm -f "$(BINDIR)/lout" "$(BINDIR)/prg2lout"

1200
print/lout/pkg-plist
View File

File diff suppressed because it is too large Load Diff