head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.144 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.142 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.140 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.138 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.136 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.134 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.132 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.130 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.128 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.126 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.124 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.122 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.120 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.118 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.116 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.114 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.112 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.110 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.108 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.106 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.104 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.102 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.100 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.96 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.76 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.98 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.94 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.92 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.90 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.88 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.86 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.84 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.82 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.80 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.78 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.74 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.72 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.70 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.68 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.66 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.64 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.62 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.60 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.58 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.56 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.54 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.52 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.50 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.48 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.46 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.44 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.42 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.40 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.38 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.36 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.34 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.32 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.30 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.28 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.26 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.24 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.22 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.20 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.18 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.16 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.14 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.12 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.10 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.8 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.6 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.4 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.2 cube-native-xorg-base:1.1; locks; strict; comment @# @; 1.1 date 2008.09.10.13.32.48; author taca; state Exp; branches; next ; desc @@ 1.1 log @Update magicpoint to 1.13a. * Fix build error with xft2 option and graphics/freetype-lib package is installed. Shoud be fix PR pkg/32656. * Refering PR pkg/38552 adpot some of patches. * Move PKG_OPTIONS related item to options.mk. * More pkgsrc clean up. * Try to reduce compile warnings. What's new in 1.13a? * m17n library support enhancement * MacOS support enhancement * add new environment variable MGPRC for the path of the .mgprc file. * add "psfont" directive to specify the font used by mgp2ps * add -g option for mgp2ps to allow users to adjust line distanc * add -zoomonclk option for newimage * allow to handle gif format images by default * many bug fixes Dedication Magicpoint 1.13a is dedicated to the memory of Dr. Jun-ichiro "itojun" Hagino, who was known for his enormous contribution to the Internet and the Open Source Software community. He was the developer of Magicpoint from its infancy. Magicpoint could not exist without his devoted work. What's new in 1.12a? * add %tsystem directive which might be more stable than %xsystem * add -rotate option for newimage * allow to use non-ASCI filename in slides (use -U to enable this feature) * many bug fixes @ text @$NetBSD$ --- contrib/xwintoppm/dsimple.c.orig 1998-02-13 16:48:29.000000000 +0900 +++ contrib/xwintoppm/dsimple.c @@@@ -35,6 +35,8 @@@@ from the X Consortium. #include #include #include +#include + /* * Other_stuff.h: Definitions of routines in other_stuff. * @@@@ -47,14 +49,9 @@@@ char *malloc(), realloc(); #include #endif +#include "dsimple.h" + extern Bool silent; -unsigned long Resolve_Color(); -Pixmap Bitmap_To_Pixmap(); -Window Select_Window(); -void out(); -void blip(); -Window Window_With_Name(); -void Fatal_Error(); /* * Just_display: A group of routines designed to make the writting of simple @@@@ -68,16 +65,16 @@@@ void Fatal_Error(); /* This stuff is defined in the calling program by just_display.h */ -extern char *program_name; -extern Display *dpy; -extern int screen; +char *program_name = "unknown_program"; /* Name of this program */ +Display *dpy; /* The current display */ +int screen; /* The current screen */ /* * Malloc: like malloc but handles out of memory using Fatal_Error. */ char *Malloc(size) - unsigned size; + unsigned int size; { char *data; @@@@ -401,7 +398,7 @@@@ Pixmap Bitmap_To_Pixmap(dpy, d, gc, bitm /* * blip: a debugging routine. Prints Blip! on stderr with flushing. */ -void blip() +void blip(void) { outl("blip!"); } @@@@ -495,12 +492,15 @@@@ Window Window_With_Name(dpy, top, name) * printf with up to 7 arguments. */ /* VARARGS1 */ -outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6) - char *msg; - char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6; +void +outl(char *msg, ...) { + va_list ap; + + va_start(ap, msg); fflush(stdout); - fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6); + fprintf(stderr, msg, ap); + va_end(ap); fprintf(stderr, "\n"); fflush(stderr); } @@@@ -511,14 +511,16 @@@@ outl(msg, arg0,arg1,arg2,arg3,arg4,arg5, * Does not require dpy or screen defined. */ /* VARARGS1 */ -void Fatal_Error(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6) -char *msg; -char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6; +void Fatal_Error(char *msg, ...) { + va_list ap; + + va_start(ap, msg); fflush(stdout); fflush(stderr); fprintf(stderr, "%s: error: ", program_name); - fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6); + vfprintf(stderr, msg, ap); + va_end(ap); fprintf(stderr, "\n"); exit(1); } @