head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.42 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.40 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.38 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.36 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.34 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.32 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.30 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.28 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.26 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.24 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.22 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.20 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.18 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.16 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.14 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.12 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.10 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.8 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.6 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.4 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.2 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.6.0.116 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.114 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.110 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.90 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.112 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.108 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.106 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.104 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.102 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.100 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.98 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.96 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.94 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.92 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.88 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.86 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.84 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.82 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.80 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.78 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.76 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.74 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.72 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.70 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.68 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.66 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.64 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.62 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.60 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.58 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.56 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.54 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.52 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.50 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.48 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.46 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.44 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.42 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.40 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.38 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.36 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.34 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.32 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.30 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.28 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.26 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.24 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.22 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.20 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.18 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.16 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.14 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.12 pkgsrc-2008Q1:1.6.0.10 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.8 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.6 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.4 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.5.0.8 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.6 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.4.0.26 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.24 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.22 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.20 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1998-03-29:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.7 date 2021.03.14.08.40.46; author wiz; state Exp; branches; next 1.6; commitid NXrFLgIbJlzjNfLC; 1.6 date 2007.03.17.01.11.22; author reed; state Exp; branches; next 1.5; 1.5 date 2005.12.27.23.50.07; author reed; state Exp; branches; next 1.4; 1.4 date 2002.02.16.01.21.53; author wiz; state Exp; branches; next 1.3; 1.3 date 2000.12.08.07.24.22; author jlam; state Exp; branches; next 1.2; 1.2 date 98.08.07.11.11.28; author agc; state Exp; branches; next 1.1; 1.1 date 98.04.01.20.57.19; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.04.01.20.57.19; author tron; state Exp; branches; next ; desc @@ 1.7 log @mpage: fix RELRO build Add PAPERSIZE to BUILD_DEFS. Bump PKGREVISION. @ text @$NetBSD: patch-aa,v 1.6 2007/03/17 01:11:22 reed Exp $ 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 -CC=gcc ############################################################################ # @@@@ -48,7 +47,7 @@@@ CC=gcc # See glob.c for all possibilities # # PAGESIZE=Letter -PAGESIZE=A4 +#PAGESIZE=A4 # # Define your spooler type @@@@ -58,11 +57,11 @@@@ PAGESIZE=A4 SPOOL_TYPE=BSD_SPOOLER # PREFIX=e:/usr # OS/2 type -PREFIX=/usr/local +#PREFIX=/usr/local #PREFIX=/usr BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/share -MANDIR=$(PREFIX)/man/man1 +#MANDIR=$(PREFIX)/man/man1 # # A default encoding is given in encoding.h. Setting ENCODING=1 will @@@@ -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. -# Linux: -CFLAGS = -O2 -s $(DEFS) -Wall +# Linux or BSD: +CFLAGS += -O2 -s $(DEFS) -Wall # AIX (xlC on aix 4): #CFLAGS = -O2 -s $(DEFS) @@@@ -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 - cp mpage$(E) $(BINDIR) - cp mpage.1 $(MANDIR) - -cp Encodings/* $(LIBDIR)/mpage - -chmod 644 $(LIBDIR)/mpage/* + $(BSD_INSTALL_PROGRAM) mpage$(E) $(BINDIR) + $(BSD_INSTALL_MAN) mpage.1 $(MANDIR) + $(BSD_INSTALL_DATA) Encodings/* $(LIBDIR)/mpage @ 1.6 log @Update to 2.5.5. (I noticed old version was not on download site last year some time.) Add another downlaod site. Make this use PKGMANDIR. Changes are: November 2006 - Released version 2.5.5 - apply Fedora restricted font and scale patches September 2005 - usage fixes - use /tmp instead of /usr/tmp - Duplex featrure settings go into %%BeginSetup section. November 2004 - Small updates to manual page May 2004 - Released version 2.5.4 - Do not explicitely switch of duplex mode when -t is not given. - Add redhat utf-8 patch - Add -u option to switch off utf-8 checking August 2003 RedHat fixes - check for empy optarg in arg processing. Suggested by J.D. Laub : - -V option to show mpage version - -- option to stop process options (remaing args are files) - add -- option to prprog when filename starts with a -. From: Sanjoy Mahajan - %% and \n fixes for Duplex Beginfeature settings. October 2002 - Released version 2.5.3 - Start moving mapge into the GPL... - Fixed double 'showsheet' output when processing postscript. - Added A0 to page_desc in glob.c. - Remove newline after formfeed. (Gregory Bond ) - the -X option now always prints the filename/header on the left and the physical page number on the right. Per suggestion of Marc Branchaud - From Neil Brown : define showheet using the load operator instead of the bind operator. This might solve situations where showpage is redefined elsewhere. - From Ilgiz Latypov : -J option to set an initial value to the pagenum counter. - Improved processing of "BeginDocument/EndDocument" directives resulting in much better handling of included EPS graphics. Should improve processing of dvips files a lot... Jun 2002 from: jdl@@access-health.com - When processing stdin, 'pr' was hardcoded instead of using the prprog variable. - Removed useless strcpy when processing command line args (could even give unpredictable results) from: dlarson@@brookings.net - explicitely set duplex printing to false in the default case. from: George.Pajari@@Faximum.com - using -m while printing in duplex creates useless margins: punching holes may go through the printed areas on one of the sides. Jan 2002 Marcel J.E. Mol marcel@@mesa.nl - lib/mpage -> share/mpage Nov 2001 Marcel J.E. Mol marcel@@mesa.nl - Changes from redhat * use mkstemp instead of mktemp. * kanji support. Oct 2000 Marcel J.E. Mol marcel@@mesa.nl - Added A1 and A2 to page_desc in glob.c. Aug 1999 Marcel J.E. Mol marcel@@mesa.nl - Added -e option and related code from Enrique Melendez Asensio to allow 4,1,2,3 booklets... Needs cleanup and extended to txt too. - Patch from Gabor Ribarik to take of dvips(k) 5.78's output if it contains many postscript figures. (see indoc variable in post.c) He (or actually Attila Karpati) also implemented multiple -j options. Fix the %%Page director when pages are skipped (with -j). - Include amiga port from Andreas R. Kleinert : * added smakefile, smakefile.ppc and SCOPTIONS * added #ifdef AMIGA section to mpage.h * mpage.h now #undefs MAXINT if already #define (before re-#defining it iself) * LIBDIR has been #define within SCOPTIONS; used MPAGE: assign, which you may redirect yourself, then... Jun 1998 Marcel J.E. Mol marcel@@mesa.nl - Clipping logical page was terribly wrong. This was visible when specifying negative pagemargins (-M). Apr 1998 Marcel J.E. Mol marcel@@mesa.nl - Corrected types (lvirden@@cas.org) Mar 1998 Marcel J.E. Mol marcel@@mesa.nl - for EPS files that have %%Trailer and are included in PS files mpage will stop after the first %%Trailer. Made check on %%Trailer (and %%PSTrailer) a runtime option -k ('kill on trailer'); - When input text file has no newline at last line, mpage forgot to print that line... - Updated manual page and usage (lm@@cs.rmit.edu.au) - warning in -b option failed. - Changed defining paper types (to add new papger tpyes, just add to the paper array in glob.c). Jan 1998 Marcel J.E. Mol marcel@@mesa.nl - Removed save/restore statements for PS input processing. They seem to generate 'memory overflow' errors. - Removed 'TexDict begin' additions for dvips files. - OS/2 changes (Alexander Mai ) - Makefile: create install dirs if not there (jwessel@@uiuc.edu) - Check for %PSTrailer (for Mathematis program) (jwessel@@uiuc.edu) - version 2.5 introduced bug in handling formfeed in text files. Fixed. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 3 --- Makefile.orig 2004-05-30 14:38:31.000000000 -0500 +++ Makefile 2006-11-30 17:26:46.000000000 -0600 @@@@ -24,7 +24,6 @@@@ d15 1 a15 1 @@@@ -40,7 +39,7 @@@@ d24 1 a24 1 @@@@ -50,11 +49,11 @@@@ d38 1 a38 1 @@@@ -106,8 +105,8 @@@@ d49 10 a58 1 @@@@ -181,7 +180,6 @@@@ @ 1.5 log @Update the patch for the makefile so it will use PKGMANDIR. @ text @d3 3 a5 3 --- Makefile.orig 1997-11-25 15:16:06.000000000 -0800 +++ Makefile @@@@ -30,7 +30,6 @@@@ d13 2 a14 2 @@@@ -45,7 +44,7 @@@@ CC=gcc # PAGE_A4 for European A4 d16 3 a18 3 # PAGESIZE=PAGE_LETTER -PAGESIZE=PAGE_A4 +#PAGESIZE=PAGE_A4 d22 1 a22 1 @@@@ -55,10 +54,9 @@@@ PAGESIZE=PAGE_A4 d27 2 d30 1 a30 1 -LIBDIR=$(PREFIX)/lib d32 1 a32 2 +LIBDIR=$(PREFIX)/share +MANDIR=$(PREFIX)/${PKGMANDIR}/man1 d36 1 a36 1 @@@@ -110,8 +108,8 @@@@ DEF_FILE = d47 4 a50 8 @@@@ -168,10 +166,10 @@@@ mpage.ps: mpage.1 # -# add your proper install stuff +# BSD specific install stuff # install: d53 2 a56 2 if [ ! -d $(LIBDIR)/mpage ] ; then mkdir $(LIBDIR)/mpage ; fi - -cp Encodings/* $(LIBDIR)/mpage @ 1.4 log @Obey PAPERSIZE, as requested in pkg/15504. @ text @d3 1 a3 1 --- Makefile.orig Wed Nov 26 00:16:06 1997 d13 1 a13 1 @@@@ -45,7 +44,7 @@@@ d22 1 a22 1 @@@@ -55,9 +54,8 @@@@ d29 1 d31 1 a31 1 MANDIR=$(PREFIX)/man/man1 d34 2 a35 1 @@@@ -110,8 +108,8 @@@@ d46 1 a46 1 @@@@ -168,10 +166,10 @@@@ @ 1.3 log @Honor CFLAGS passed in from environment during build. @ text @d3 1 a3 1 --- Makefile.orig Tue Nov 25 18:16:06 1997 d13 9 @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 2 a4 2 --- Makefile~ Tue Nov 25 23:16:06 1997 +++ Makefile Thu Feb 19 15:18:17 1998 d24 11 @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Initial import of FreeBSD's "mpage" port. @ text @@