[arch-commits] Commit in lout/repos/community-x86_64 (6 files)

George Rawlinson grawlinson at gemini.archlinux.org
Sat Dec 18 16:02:24 UTC 2021


    Date: Saturday, December 18, 2021 @ 16:02:23
  Author: grawlinson
Revision: 1077225

archrelease: copy trunk to community-x86_64

Added:
  lout/repos/community-x86_64/PKGBUILD
    (from rev 1077224, lout/trunk/PKGBUILD)
  lout/repos/community-x86_64/add-destdir.patch
    (from rev 1077224, lout/trunk/add-destdir.patch)
  lout/repos/community-x86_64/use-cflags-ldflags.patch
    (from rev 1077224, lout/trunk/use-cflags-ldflags.patch)
Deleted:
  lout/repos/community-x86_64/PKGBUILD
  lout/repos/community-x86_64/lout.install
  lout/repos/community-x86_64/makefile.arch

--------------------------+
 PKGBUILD                 |   94 ++++++++++++++---------
 add-destdir.patch        |  177 +++++++++++++++++++++++++++++++++++++++++++++
 lout.install             |   11 --
 makefile.arch            |   45 -----------
 use-cflags-ldflags.patch |   43 ++++++++++
 5 files changed, 277 insertions(+), 93 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-18 16:01:24 UTC (rev 1077224)
+++ PKGBUILD	2021-12-18 16:02:23 UTC (rev 1077225)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: catwell <catwell at archlinux.us>
-
-pkgname=lout
-pkgver=3.40
-pkgrel=2
-pkgdesc="A lightweight document formatting system."
-arch=('x86_64')
-#url="http://lout.wiki.sourceforge.net/"
-url="http://savannah.nongnu.org/projects/lout"
-license=('GPL')
-depends=('glibc')
-install=lout.install
-source=(http://mirrors.ctan.org/support/$pkgname/$pkgname-$pkgver.tar.gz
-        makefile.arch
-        lout.install
-        http://pkgs.fedoraproject.org/repo/pkgs/lout/slides.pdf/6822c33e49a1dca0b090f297d404d7fa/slides.pdf)
-md5sums=('fd0fe084cebd07fc209d392a2d380755'
-         '088a29ca16477a9a30da9fafc9391de8'
-         '597cd52eb87ef6253cf769bed4db3952'
-         '6822c33e49a1dca0b090f297d404d7fa')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cp ../makefile.arch .
-  make -f makefile.arch
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -f makefile.arch PKGDIR="$pkgdir" install
-  chmod 0775  "$pkgdir/usr/lib/lout/data/"
-  chgrp users "$pkgdir/usr/lib/lout/data/"
-  install -Dm644 "$srcdir/slides.pdf" "$pkgdir/usr/share/doc/$pkgname/introduction.pdf"
-}
-

Copied: lout/repos/community-x86_64/PKGBUILD (from rev 1077224, lout/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-18 16:02:23 UTC (rev 1077225)
@@ -0,0 +1,57 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+# Contributor: catwell <catwell at archlinux.us>
+
+pkgname=lout
+pkgver=3.42
+pkgrel=1
+pkgdesc="A lightweight document formatting system"
+arch=('x86_64')
+url="https://github.com/william8000/lout"
+license=('GPL')
+depends=('glibc' 'zlib')
+options=('!emptydirs')
+source=(
+  "$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+  'use-cflags-ldflags.patch'
+  'add-destdir.patch'
+)
+sha512sums=('2c6e496bbacbce68f1c0b6a8c4b18eb275264c04eae14afc9f59fdc7578457da001c7f0fe4c0c1a1603618a1e4528ba41e53539c3c5e8e747221abaf9d1df8f2'
+            'ae9797c1fa889075c7ac71d53b307a235112781e2b3e935b4992fd254e1bc9e9ad6672b9df51af751420c524db330d3c38a49f8046efb67f51c512e4de759455'
+            '87a8b2e45536680a7247509aef881006e4b2b6483aef4c6bc2204b341e1a1c211d654e1f87bf4155d0e2ddce59bb2ceb458bb2399584f02270fdf4add599226c')
+b2sums=('2352de7ab6b1133892b93a2a74d84fb57c6e5f3f4f56bb711ec9a8ea16e51e1e34e8524a296d4490b871a8d8d31916a1a24c0c9f5c1f68cad8d222f915fe7cfc'
+        'd85b9c455c0cabf7e420a46ae8e423bd842ae36563944dfebc12c557b0077d6160813206be36adad637459947b695e8831f11d6de35dbb8a73eb0891d0fefb26'
+        '7b5fe13b9ff1e6522af6949874dfce4d3db1143f36bec3f9dc22edc12d2f0a6c923e80583f0db8b69621eef868f751e0b9908b107f421f7f0d12b9e1f2c2f869')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # ensure CFLAGS/LDFLAGS are passed
+  patch -p1 -i ../use-cflags-ldflags.patch
+
+  # add $DESTDIR variable to Makefile
+  patch -p1 -i ../add-destdir.patch
+
+  # simplify paths
+  sed -i \
+    -e 's:^MANDIR.*:MANDIR  = $(PREFIX)/share/man/man1:' \
+    -e 's:^LIBDIR.*:LIBDIR = $(PREFIX)/lib/lout:' \
+    -e 's:^LOUTLIBDIR.*:LOUTLIBDIR = $(LIBDIR):' \
+    makefile
+
+  # TODO generate documentation
+  #-e 's:^LOUTDOCDIR.*:LOUTDOCDIR = $(PREFIX)/share/doc/lout:' \
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  make PDF_COMPRESSION=1 ZLIB=-lz PREFIX=/usr all
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make PREFIX=/usr DESTDIR="$pkgdir" install installman
+}
+

Copied: lout/repos/community-x86_64/add-destdir.patch (from rev 1077224, lout/trunk/add-destdir.patch)
===================================================================
--- add-destdir.patch	                        (rev 0)
+++ add-destdir.patch	2021-12-18 16:02:23 UTC (rev 1077225)
@@ -0,0 +1,177 @@
+--- a/makefile
++++ b/makefile
+@@ -364,109 +364,111 @@ all:	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
++	if [ ! -d $(DESTDIR)$(BINDIR) ] ; then $(MKDIR) $(DESTDIR)$(BINDIR) ; fi
++	chmod 755 $(DESTDIR)$(BINDIR)
++	cp lout $(DESTDIR)$(BINDIR)/lout
++	chmod 755 $(DESTDIR)$(BINDIR)/lout
++	cp prg2lout $(DESTDIR)$(BINDIR)/prg2lout
++	chmod 755 $(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)
+ 	@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 -x -s $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/init -I $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL) -H $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH) -D $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
+ 	@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"
+-	-rm -f "$(MANDIR)/lout.1" "$(MANDIR)/prg2lout.1"
++	-rm -f "$(DESTDIR)$(BINDIR)/lout" "$(DESTDIR)$(BINDIR)/prg2lout"
++	-rm -f "$(DESTDIR)$(MANDIR)/lout.1" "$(DESTDIR)$(MANDIR)/prg2lout.1"
+ 	{ \
+-		for dir in "$(LOUTLIBDIR)" "$(LOUTDOCDIR)" ; do \
++		for dir in "$(DESTDIR)$(LOUTLIBDIR)" "$(DESTDIR)$(LOUTDOCDIR)" ; do \
+ 			if [ -n "$$dir" ] && [ -d "$$dir" ] ; then \
+ 				case "$$dir" in \
+ 				*lout*) rm -fr "$$dir" ;; \
+ 				esac ; \
+ 			fi ; \
+ 		done ; \
+-		for dir in "$(MANDIR)" "$(LIBDIR)" ; do \
++		for dir in "$(DESTDIR)$(MANDIR)" "$(DESTDIR)$(LIBDIR)" ; do \
+ 			if [ -n "$$dir" ] && [ -d "$$dir" ] ; then \
+ 				case "$$dir" in \
+ 				*lout*) rmdir "$$dir" ;; \
+

Deleted: lout.install
===================================================================
--- lout.install	2021-12-18 16:01:24 UTC (rev 1077224)
+++ lout.install	2021-12-18 16:02:23 UTC (rev 1077225)
@@ -1,11 +0,0 @@
-post_install()
-{
-  /usr/bin/lout -x -s /usr/lib/lout/include/init
-  chmod 0775  "/usr/lib/lout/data/"
-  chgrp users "/usr/lib/lout/data/"
-}
-
-post_upgrade()
-{
- post_install $1
-}

Deleted: makefile.arch
===================================================================
--- makefile.arch	2021-12-18 16:01:24 UTC (rev 1077224)
+++ makefile.arch	2021-12-18 16:02:23 UTC (rev 1077225)
@@ -1,45 +0,0 @@
-# Makefile for lout 3.38 on Arch Linux.
-# catwell <catwell at archlinux.us>
-
-PKGDIR = /
-COPTS = -ansi -pedantic -O3
-
-CFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 \
-  -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"/usr/lib/lout\" -DFONT_DIR=\"font\" \
-  -DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" -DHYPH_DIR=\"hyph\" \
-  -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=0 \
-  -DASSERT_ON=1 $(COPTS) -DDEBUG_ON=0 -DPDF_COMPRESSION=1 -I/usr/lib/
-
-OBJS = z01.o z02.o z03.o z04.o z05.o z06.o z07.o z08.o \
-  z09.o z10.o z11.o z12.o z13.o z14.o z15.o z16.o \
-  z17.o z18.o z19.o z20.o z21.o z22.o z23.o z24.o \
-  z25.o z26.o z27.o z28.o z29.o z30.o z31.o z32.o \
-  z33.o z34.o z35.o z36.o z37.o z38.o z39.o z40.o \
-  z41.o z42.o z43.o z44.o z45.o z46.o z47.o z48.o \
-  z49.o z50.o z51.o z52.o
-
-arch: $(OBJS)
-	gcc -o lout $(OBJS) /usr/lib/libz.a -lm
-	gcc -o prg2lout prg2lout.c
-
-$(OBJS): externs.h
-
-externs.h:
-
-install: arch
-	# lout
-	install -Dm0755 lout $(PKGDIR)/usr/bin/lout
-	set include data hyph font maps; \
-	for i; do \
-	  install -d $(PKGDIR)/usr/lib/lout/$$i; \
-	  install -m0644 -t $(PKGDIR)/usr/lib/lout/$$i/ $$i/*; \
-	done
-	# prg2lout
-	install -Dm0755 prg2lout $(PKGDIR)/usr/bin/prg2lout
-	# man
-	sed -i -e "s@<BINDIR>@/usr/bin@" -e "s@<LIBDIR>@/usr/lib/lout@" \
-	  -e "s@<LOUTDOCDIR>@/usr/doc/lout@" -e "s@<MANDIR>@/usr/share/man/man1@" \
-	man/lout.1
-	install -Dm0644 man/lout.1 $(PKGDIR)/usr/share/man/man1/lout.1
-	install -Dm0644 man/prg2lout.1 $(PKGDIR)/usr/share/man/man1/prg2lout.1  
-

Copied: lout/repos/community-x86_64/use-cflags-ldflags.patch (from rev 1077224, lout/trunk/use-cflags-ldflags.patch)
===================================================================
--- use-cflags-ldflags.patch	                        (rev 0)
+++ use-cflags-ldflags.patch	2021-12-18 16:02:23 UTC (rev 1077225)
@@ -0,0 +1,43 @@
+--- a/makefile
++++ b/makefile
+@@ -315,9 +315,10 @@ 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
++CFLAGS ?= -ansi -pedantic -Wall -O3 -pipe
+ 
+-CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
++
++CFLAGS	+= -DOS_UNIX=$(OSUNIX)					\
+ 	  -DOS_DOS=$(OSDOS)					\
+ 	  -DOS_MAC=$(OSMAC)					\
+ 	  -DDB_FIX=$(DBFIX)					\
+@@ -334,7 +335,7 @@ CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
+ 	  -DCHAR_IN=$(CHARIN)					\
+ 	  -DCHAR_OUT=$(CHAROUT)					\
+ 	  -DLOCALE_ON=$(USELOC)					\
+-	  -DASSERT_ON=1 $(COPTS)				\
++	  -DASSERT_ON=1 					\
+ 	  -DDEBUG_ON=$(DEBUGGING)				\
+ 	  $(TRACING)						\
+ 	  -DPDF_COMPRESSION=$(PDF_COMPRESSION)			\
+@@ -349,16 +350,14 @@ OBJS	= z01.o z02.o z03.o z04.o z05.o z06.o z07.o z08.o	\
+ 	  z49.o z50.o z51.o z52.o
+ 
+ lout:	$(OBJS)
+-	$(CC) $(CFLAGS) -o lout $(OBJS) $(ZLIB) -lm
+-	chmod a+x lout
++	$(CC) $(LDFLAGS) $(CFLAGS) -o lout $(OBJS) $(ZLIB) -lm
+ 
+ $(OBJS): externs.h
+ 
+ externs.h:
+ 
+ prg2lout:	prg2lout.c
+-	$(CC) $(COPTS) -o prg2lout prg2lout.c
+-	chmod a+x prg2lout
++	$(CC) $(LDFLAGS) $(CFLAGS) -o prg2lout prg2lout.c
+ 
+ all:	lout prg2lout
+ 



More information about the arch-commits mailing list