CVS commit: pkgsrc/print/mpage

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 14 08:40:46 UTC 2021

Modified Files:
        pkgsrc/print/mpage: Makefile distinfo
        pkgsrc/print/mpage/patches: patch-aa

Log Message:
mpage: fix RELRO build

Add PAPERSIZE to BUILD_DEFS.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/print/mpage/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/mpage/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/mpage/patches/patch-aa

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

Modified files:

Index: pkgsrc/print/mpage/Makefile
diff -u pkgsrc/print/mpage/Makefile:1.27 pkgsrc/print/mpage/Makefile:1.28
--- pkgsrc/print/mpage/Makefile:1.27    Tue Mar 24 18:12:08 2020
+++ pkgsrc/print/mpage/Makefile Sun Mar 14 08:40:46 2021
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.27 2020/03/24 18:12:08 nia Exp $
+# $NetBSD: Makefile,v 1.28 2021/03/14 08:40:46 wiz Exp $
 
 DISTNAME=      mpage-2.5.7
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES+= https://www.mesa.nl/pub/mpage/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       Print multiple pages per sheet of paper
 HOMEPAGE=      https://www.mesa.nl/download.html
+COMMENT=       Print multiple pages per sheet of paper
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 BUILD_TARGET=          default
+BUILD_DEFS+=           PAPERSIZE
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX} \
                        MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 

Index: pkgsrc/print/mpage/distinfo
diff -u pkgsrc/print/mpage/distinfo:1.9 pkgsrc/print/mpage/distinfo:1.10
--- pkgsrc/print/mpage/distinfo:1.9     Tue Mar 24 18:12:08 2020
+++ pkgsrc/print/mpage/distinfo Sun Mar 14 08:40:46 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2020/03/24 18:12:08 nia Exp $
+$NetBSD: distinfo,v 1.10 2021/03/14 08:40:46 wiz Exp $
 
 SHA1 (mpage-2.5.7.tgz) = 38e01d9a53b77412e951da7fb8f040424b409f7c
 RMD160 (mpage-2.5.7.tgz) = 08518c16cc4e1790b677fd89f5ea610ac3b47c5f
 SHA512 (mpage-2.5.7.tgz) = e456e5daae7f6f395b34e5833baaeff74f5e00a0e61b780fcd600cdbe6455a9be8e0c9811ba21db167bea135de8e268fe4ede553e0a19630d5b854ec5620726b
 Size (mpage-2.5.7.tgz) = 87190 bytes
-SHA1 (patch-aa) = 2a48eb59e02842720be4320326123009ba67e3da
+SHA1 (patch-aa) = 83f67077bbb8aa4bcd6227489cb773975ad1e832

Index: pkgsrc/print/mpage/patches/patch-aa
diff -u pkgsrc/print/mpage/patches/patch-aa:1.6 pkgsrc/print/mpage/patches/patch-aa:1.7
--- pkgsrc/print/mpage/patches/patch-aa:1.6     Sat Mar 17 01:11:22 2007
+++ pkgsrc/print/mpage/patches/patch-aa Sun Mar 14 08:40:46 2021
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2007/03/17 01:11:22 reed Exp $
+$NetBSD: patch-aa,v 1.7 2021/03/14 08:40:46 wiz Exp $
 
---- Makefile.orig      2004-05-30 14:38:31.000000000 -0500
-+++ Makefile   2006-11-30 17:26:46.000000000 -0600
-@@ -24,7 +24,6 @@
+Fix build.
+
+--- Makefile.orig      2017-06-28 08:07:41.000000000 +0000
++++ Makefile
+@@ -32,7 +32,6 @@
  # Set this to an ANSI compatible C compiler (preferably gcc)
  # See also system specific settings below
  #CC=cc
@@ -10,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/17 01:11
  
  ############################################################################
  #
-@@ -40,7 +39,7 @@
+@@ -48,7 +47,7 @@ CC=gcc
  #  See glob.c for all possibilities
  #
  # PAGESIZE=Letter
@@ -19,7 +21,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/17 01:11
  
  #
  # Define your spooler type
-@@ -50,11 +49,11 @@
+@@ -58,11 +57,11 @@ PAGESIZE=A4
  SPOOL_TYPE=BSD_SPOOLER
  
  # PREFIX=e:/usr               # OS/2 type
@@ -33,7 +35,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/17 01:11
  
  #
  # A default encoding is given in encoding.h. Setting ENCODING=1 will
-@@ -106,8 +105,8 @@
+@@ -114,8 +113,8 @@ O = .o
  # Choose one of the following CFLAGS/CC definitions:
  # If you are using gcc, you probably don't need to change anything here.
  
@@ -44,7 +46,16 @@ $NetBSD: patch-aa,v 1.6 2007/03/17 01:11
  
  # AIX (xlC on aix 4):
  #CFLAGS = -O2 -s $(DEFS)
-@@ -181,7 +180,6 @@
+@@ -158,7 +157,7 @@ default:   mpage$(E) msample$(E) mpage.1
+       @echo Done!
+ 
+ mpage$(E):    $(MOBJ)
+-      $(CC) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
++      $(CC) $(LDFLAGS) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
+ 
+ msample$(E):  $(SOBJ)
+       $(CC) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
+@@ -189,7 +188,6 @@ install:
        if [ ! -d $(LIBDIR)/mpage ] ; then mkdir -p $(LIBDIR)/mpage ; fi
        if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR) ; fi
        if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi