Sun Mar 14 08:40:46 2021 UTC ()
mpage: fix RELRO build

Add PAPERSIZE to BUILD_DEFS.

Bump PKGREVISION.


(wiz)
diff -r1.27 -r1.28 pkgsrc/print/mpage/Makefile
diff -r1.9 -r1.10 pkgsrc/print/mpage/distinfo
diff -r1.6 -r1.7 pkgsrc/print/mpage/patches/patch-aa
cvs diff -r1.27 -r1.28 pkgsrc/print/mpage/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mpage/Makefile 2020/03/24 18:12:08 1.27
+++ pkgsrc/print/mpage/Makefile 2021/03/14 08:40:46 1.28
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.27 2020/03/24 18:12:08 nia Exp $ 1# $NetBSD: Makefile,v 1.28 2021/03/14 08:40:46 wiz Exp $
2 2
3DISTNAME= mpage-2.5.7 3DISTNAME= mpage-2.5.7
 4PKGREVISION= 1
4CATEGORIES= print 5CATEGORIES= print
5MASTER_SITES+= https://www.mesa.nl/pub/mpage/ 6MASTER_SITES+= https://www.mesa.nl/pub/mpage/
6EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Print multiple pages per sheet of paper 
10HOMEPAGE= https://www.mesa.nl/download.html 10HOMEPAGE= https://www.mesa.nl/download.html
 11COMMENT= Print multiple pages per sheet of paper
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
12 13
13BUILD_TARGET= default 14BUILD_TARGET= default
 15BUILD_DEFS+= PAPERSIZE
14INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ 16INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \
15 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 17 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
16 18
17.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
18MAKE_ENV+= PAGESIZE=${PAPERSIZE} 20MAKE_ENV+= PAGESIZE=${PAPERSIZE}
19 21
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/print/mpage/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mpage/distinfo 2020/03/24 18:12:08 1.9
+++ pkgsrc/print/mpage/distinfo 2021/03/14 08:40:46 1.10
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.9 2020/03/24 18:12:08 nia Exp $ 1$NetBSD: distinfo,v 1.10 2021/03/14 08:40:46 wiz Exp $
2 2
3SHA1 (mpage-2.5.7.tgz) = 38e01d9a53b77412e951da7fb8f040424b409f7c 3SHA1 (mpage-2.5.7.tgz) = 38e01d9a53b77412e951da7fb8f040424b409f7c
4RMD160 (mpage-2.5.7.tgz) = 08518c16cc4e1790b677fd89f5ea610ac3b47c5f 4RMD160 (mpage-2.5.7.tgz) = 08518c16cc4e1790b677fd89f5ea610ac3b47c5f
5SHA512 (mpage-2.5.7.tgz) = e456e5daae7f6f395b34e5833baaeff74f5e00a0e61b780fcd600cdbe6455a9be8e0c9811ba21db167bea135de8e268fe4ede553e0a19630d5b854ec5620726b 5SHA512 (mpage-2.5.7.tgz) = e456e5daae7f6f395b34e5833baaeff74f5e00a0e61b780fcd600cdbe6455a9be8e0c9811ba21db167bea135de8e268fe4ede553e0a19630d5b854ec5620726b
6Size (mpage-2.5.7.tgz) = 87190 bytes 6Size (mpage-2.5.7.tgz) = 87190 bytes
7SHA1 (patch-aa) = 2a48eb59e02842720be4320326123009ba67e3da 7SHA1 (patch-aa) = 83f67077bbb8aa4bcd6227489cb773975ad1e832
cvs diff -r1.6 -r1.7 pkgsrc/print/mpage/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/mpage/patches/patch-aa 2007/03/17 01:11:22 1.6
+++ pkgsrc/print/mpage/patches/patch-aa 2021/03/14 08:40:46 1.7
@@ -1,57 +1,68 @@ @@ -1,57 +1,68 @@
1$NetBSD: patch-aa,v 1.6 2007/03/17 01:11:22 reed Exp $ 1$NetBSD: patch-aa,v 1.7 2021/03/14 08:40:46 wiz Exp $
2 2
3--- Makefile.orig 2004-05-30 14:38:31.000000000 -0500 3Fix build.
4+++ Makefile 2006-11-30 17:26:46.000000000 -0600 4
5@@ -24,7 +24,6 @@ 5--- Makefile.orig 2017-06-28 08:07:41.000000000 +0000
 6+++ Makefile
 7@@ -32,7 +32,6 @@
6 # Set this to an ANSI compatible C compiler (preferably gcc) 8 # Set this to an ANSI compatible C compiler (preferably gcc)
7 # See also system specific settings below 9 # See also system specific settings below
8 #CC=cc 10 #CC=cc
9-CC=gcc 11-CC=gcc
10  12
11 ############################################################################ 13 ############################################################################
12 # 14 #
13@@ -40,7 +39,7 @@ 15@@ -48,7 +47,7 @@ CC=gcc
14 # See glob.c for all possibilities 16 # See glob.c for all possibilities
15 # 17 #
16 # PAGESIZE=Letter 18 # PAGESIZE=Letter
17-PAGESIZE=A4 19-PAGESIZE=A4
18+#PAGESIZE=A4 20+#PAGESIZE=A4
19  21
20 # 22 #
21 # Define your spooler type 23 # Define your spooler type
22@@ -50,11 +49,11 @@ 24@@ -58,11 +57,11 @@ PAGESIZE=A4
23 SPOOL_TYPE=BSD_SPOOLER 25 SPOOL_TYPE=BSD_SPOOLER
24  26
25 # PREFIX=e:/usr # OS/2 type 27 # PREFIX=e:/usr # OS/2 type
26-PREFIX=/usr/local 28-PREFIX=/usr/local
27+#PREFIX=/usr/local 29+#PREFIX=/usr/local
28 #PREFIX=/usr 30 #PREFIX=/usr
29 BINDIR=$(PREFIX)/bin 31 BINDIR=$(PREFIX)/bin
30 LIBDIR=$(PREFIX)/share 32 LIBDIR=$(PREFIX)/share
31-MANDIR=$(PREFIX)/man/man1 33-MANDIR=$(PREFIX)/man/man1
32+#MANDIR=$(PREFIX)/man/man1 34+#MANDIR=$(PREFIX)/man/man1
33  35
34 # 36 #
35 # A default encoding is given in encoding.h. Setting ENCODING=1 will 37 # A default encoding is given in encoding.h. Setting ENCODING=1 will
36@@ -106,8 +105,8 @@ 38@@ -114,8 +113,8 @@ O = .o
37 # Choose one of the following CFLAGS/CC definitions: 39 # Choose one of the following CFLAGS/CC definitions:
38 # If you are using gcc, you probably don't need to change anything here. 40 # If you are using gcc, you probably don't need to change anything here.
39  41
40-# Linux: 42-# Linux:
41-CFLAGS = -O2 -s $(DEFS) -Wall 43-CFLAGS = -O2 -s $(DEFS) -Wall
42+# Linux or BSD: 44+# Linux or BSD:
43+CFLAGS += -O2 -s $(DEFS) -Wall 45+CFLAGS += -O2 -s $(DEFS) -Wall
44  46
45 # AIX (xlC on aix 4): 47 # AIX (xlC on aix 4):
46 #CFLAGS = -O2 -s $(DEFS) 48 #CFLAGS = -O2 -s $(DEFS)
47@@ -181,7 +180,6 @@ 49@@ -158,7 +157,7 @@ default: mpage$(E) msample$(E) mpage.1
 50 @echo Done!
 51
 52 mpage$(E): $(MOBJ)
 53- $(CC) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
 54+ $(CC) $(LDFLAGS) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
 55
 56 msample$(E): $(SOBJ)
 57 $(CC) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
 58@@ -189,7 +188,6 @@ install:
48 if [ ! -d $(LIBDIR)/mpage ] ; then mkdir -p $(LIBDIR)/mpage ; fi 59 if [ ! -d $(LIBDIR)/mpage ] ; then mkdir -p $(LIBDIR)/mpage ; fi
49 if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR) ; fi 60 if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR) ; fi
50 if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi 61 if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
51- cp mpage$(E) $(BINDIR) 62- cp mpage$(E) $(BINDIR)
52- cp mpage.1 $(MANDIR) 63- cp mpage.1 $(MANDIR)
53- -cp Encodings/* $(LIBDIR)/mpage 64- -cp Encodings/* $(LIBDIR)/mpage
54- -chmod 644 $(LIBDIR)/mpage/* 65- -chmod 644 $(LIBDIR)/mpage/*
55+ $(BSD_INSTALL_PROGRAM) mpage$(E) $(BINDIR) 66+ $(BSD_INSTALL_PROGRAM) mpage$(E) $(BINDIR)
56+ $(BSD_INSTALL_MAN) mpage.1 $(MANDIR) 67+ $(BSD_INSTALL_MAN) mpage.1 $(MANDIR)
57+ $(BSD_INSTALL_DATA) Encodings/* $(LIBDIR)/mpage 68+ $(BSD_INSTALL_DATA) Encodings/* $(LIBDIR)/mpage