Date: Sat, 18 Feb 2017 09:59:31 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434338 - in head/misc/magicpoint: . files Message-ID: <201702180959.v1I9xVIn027702@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Feb 18 09:59:30 2017 New Revision: 434338 URL: https://svnweb.freebsd.org/changeset/ports/434338 Log: - fix warnings - make portlint happier Added: head/misc/magicpoint/files/patch-dsimple.c (contents, props changed) head/misc/magicpoint/files/patch-grammar.y (contents, props changed) head/misc/magicpoint/files/patch-main.c (contents, props changed) head/misc/magicpoint/files/patch-path.c (contents, props changed) head/misc/magicpoint/files/patch-window.c (contents, props changed) head/misc/magicpoint/files/patch-xwintoppm.c (contents, props changed) Modified: head/misc/magicpoint/Makefile head/misc/magicpoint/files/patch-configure head/misc/magicpoint/files/patch-ctlwords.c head/misc/magicpoint/files/patch-default.mgp head/misc/magicpoint/files/patch-draw.c head/misc/magicpoint/files/patch-mgp.h head/misc/magicpoint/files/patch-new.c head/misc/magicpoint/files/patch-png.c head/misc/magicpoint/files/patch-rlelib.c Modified: head/misc/magicpoint/Makefile ============================================================================== --- head/misc/magicpoint/Makefile Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/Makefile Sat Feb 18 09:59:30 2017 (r434338) @@ -3,7 +3,7 @@ PORTNAME= magicpoint PORTVERSION= 1.13a -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES?= misc MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ @@ -81,6 +81,7 @@ post-install: ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \ ${STAGEDIR}${PREFIX}/bin/ + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xmindpath post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/misc/magicpoint/files/patch-configure ============================================================================== --- head/misc/magicpoint/files/patch-configure Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-configure Sat Feb 18 09:59:30 2017 (r434338) @@ -1,6 +1,6 @@ ---- configure.orig Wed Aug 4 09:23:35 2004 -+++ configure Fri Nov 5 13:36:43 2004 -@@ -4134,6 +4134,8 @@ +--- configure.orig 2007-12-28 20:31:26 UTC ++++ configure +@@ -5106,6 +5106,8 @@ echo $ECHO_N "checking for freetype1 lib fi if test -d $dir/include -a -f $dir/include/freetype.h; then ac_cv_ft_include="$dir/include" Modified: head/misc/magicpoint/files/patch-ctlwords.c ============================================================================== --- head/misc/magicpoint/files/patch-ctlwords.c Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-ctlwords.c Sat Feb 18 09:59:30 2017 (r434338) @@ -1,10 +1,11 @@ ---- ctlwords.c.orig 1999-02-15 00:02:25.000000000 +0100 -+++ ctlwords.c 2013-11-08 09:05:06.000000000 +0100 -@@ -24,6 +24,7 @@ +--- ctlwords.c.orig 1999-02-14 23:02:25 UTC ++++ ctlwords.c +@@ -24,6 +24,8 @@ BEGIN { #include <stdio.h> #include <string.h> +#include <stdlib.h> ++#include <ctype.h> main(int argc, char *argv[]) { Modified: head/misc/magicpoint/files/patch-default.mgp ============================================================================== --- head/misc/magicpoint/files/patch-default.mgp Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-default.mgp Sat Feb 18 09:59:30 2017 (r434338) @@ -1,5 +1,5 @@ ---- sample/default.mgp.orig Sat Aug 11 01:40:54 2001 -+++ sample/default.mgp Tue Jan 25 13:56:12 2005 +--- sample/default.mgp.orig 2001-08-10 16:40:54 UTC ++++ sample/default.mgp @@ -12,9 +12,9 @@ %% into the "tfdir" directory above: %% ftp://ftp.mew.org/pub/mgp/ttf-jp.tar.gz Modified: head/misc/magicpoint/files/patch-draw.c ============================================================================== --- head/misc/magicpoint/files/patch-draw.c Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-draw.c Sat Feb 18 09:59:30 2017 (r434338) @@ -1,6 +1,6 @@ ---- draw.c.orig 2008-01-24 16:43:17.000000000 +0100 -+++ draw.c 2013-09-03 06:48:44.000000000 +0200 -@@ -5471,12 +5471,12 @@ +--- draw.c.orig 2008-01-24 15:43:17 UTC ++++ draw.c +@@ -5471,12 +5471,12 @@ xft_setfont(xfontarg, csize, registry) XFT_FAMILY, XftTypeString, font, XFT_ENCODING, XftTypeString, registry, XFT_STYLE, XftTypeString, style, Added: head/misc/magicpoint/files/patch-dsimple.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-dsimple.c Sat Feb 18 09:59:30 2017 (r434338) @@ -0,0 +1,21 @@ +--- contrib/xwintoppm/dsimple.c.orig 1998-02-13 07:48:29 UTC ++++ contrib/xwintoppm/dsimple.c +@@ -55,6 +55,10 @@ void out(); + void blip(); + Window Window_With_Name(); + void Fatal_Error(); ++void usage(void); ++ ++/* forward */ ++void outl(); + + /* + * Just_display: A group of routines designed to make the writting of simple +@@ -495,6 +499,7 @@ Window Window_With_Name(dpy, top, name) + * printf with up to 7 arguments. + */ + /* VARARGS1 */ ++void + outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6) + char *msg; + char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6; Added: head/misc/magicpoint/files/patch-grammar.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-grammar.y Sat Feb 18 09:59:30 2017 (r434338) @@ -0,0 +1,11 @@ +--- grammar.y.orig 2008-01-18 17:43:20 UTC ++++ grammar.y +@@ -70,6 +70,8 @@ + static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF }; + #endif + ++extern int yylex (void); ++ + int n_errors = 0; + struct ctrl *root; + char *yyfilename; Added: head/misc/magicpoint/files/patch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-main.c Sat Feb 18 09:59:30 2017 (r434338) @@ -0,0 +1,13 @@ +--- contrib/xmindpath/main.c.orig 1998-09-30 23:58:17 UTC ++++ contrib/xmindpath/main.c +@@ -42,6 +42,10 @@ + #include <X11/X.h> + #include <X11/extensions/XTest.h> + #include <X11/keysym.h> ++#include <string.h> ++#include <err.h> ++#include <sys/types.h> ++#include <libutil.h> + + #ifdef X_DISPLAY_MISSING + # error this program cannot be compiled without X11. Modified: head/misc/magicpoint/files/patch-mgp.h ============================================================================== --- head/misc/magicpoint/files/patch-mgp.h Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-mgp.h Sat Feb 18 09:59:30 2017 (r434338) @@ -1,5 +1,5 @@ ---- mgp.h.orig 2013-12-25 10:03:40.000000000 +0100 -+++ mgp.h 2013-12-25 10:05:28.000000000 +0100 +--- mgp.h.orig 2008-01-18 17:43:20 UTC ++++ mgp.h @@ -91,7 +91,7 @@ #endif /* end of VFLIB */ @@ -9,3 +9,11 @@ #ifndef FREETYPEFONTDIR #define FREETYPEFONTDIR "/usr/local/share/fonts/ttf" +@@ -853,3 +853,7 @@ extern void M17N_process_direc __P((char + extern void M17N_draw_string __P((struct render_state *, struct ctrl *cp)); + extern void M17N_draw_object __P((struct render_object *, Drawable, int, int)); + #endif ++ ++extern void mngload(char *mngfile, int x, int y, int width, int height); ++extern void mngpreload(struct render_state *state, char *mngfile, int *width, int *height); ++ Modified: head/misc/magicpoint/files/patch-new.c ============================================================================== --- head/misc/magicpoint/files/patch-new.c Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-new.c Sat Feb 18 09:59:30 2017 (r434338) @@ -1,5 +1,5 @@ ---- image/new.c.orig Tue Aug 31 20:50:32 2004 -+++ image/new.c Fri Nov 5 13:53:17 2004 +--- image/new.c.orig 2004-09-01 03:50:32 UTC ++++ image/new.c @@ -11,7 +11,7 @@ #include "copyright.h" #include "image.h" Added: head/misc/magicpoint/files/patch-path.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-path.c Sat Feb 18 09:59:30 2017 (r434338) @@ -0,0 +1,11 @@ +--- image/path.c.orig 2004-07-28 15:47:31 UTC ++++ image/path.c +@@ -20,7 +20,7 @@ + #if 1 /* SYSV */ + #include <unistd.h> + #endif +-#ifdef __APPLE__ ++#if 1 + #include <stdlib.h> + #endif + Modified: head/misc/magicpoint/files/patch-png.c ============================================================================== --- head/misc/magicpoint/files/patch-png.c Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-png.c Sat Feb 18 09:59:30 2017 (r434338) @@ -1,6 +1,6 @@ ---- image/png.c.orig 2001-04-11 10:37:00.000000000 +0200 -+++ image/png.c 2012-05-05 08:48:02.000000000 +0200 -@@ -86,7 +86,7 @@ +--- image/png.c.orig 2001-04-11 08:37:00 UTC ++++ image/png.c +@@ -86,7 +86,7 @@ pngLoad(fullname, name, verbose) return NULL; } @@ -9,7 +9,7 @@ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); fclose(fp); return NULL; -@@ -134,7 +134,7 @@ +@@ -134,7 +134,7 @@ pngLoad(fullname, name, verbose) } if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8){ Modified: head/misc/magicpoint/files/patch-rlelib.c ============================================================================== --- head/misc/magicpoint/files/patch-rlelib.c Sat Feb 18 09:10:56 2017 (r434337) +++ head/misc/magicpoint/files/patch-rlelib.c Sat Feb 18 09:59:30 2017 (r434338) @@ -1,5 +1,5 @@ ---- image/rlelib.c.bak 2007-05-18 01:47:33.000000000 +0900 -+++ image/rlelib.c 2008-11-06 23:38:04.000000000 +0900 +--- image/rlelib.c.orig 2007-05-17 16:47:33 UTC ++++ image/rlelib.c @@ -13,7 +13,7 @@ #include <stdio.h> #include <math.h> Added: head/misc/magicpoint/files/patch-window.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-window.c Sat Feb 18 09:59:30 2017 (r434338) @@ -0,0 +1,11 @@ +--- image/window.c.orig 2004-07-28 15:47:31 UTC ++++ image/window.c +@@ -32,7 +32,7 @@ + #if HAVE_SYS_SELECT_H + # include <sys/select.h> + #endif +-#ifdef __APPLE__ ++#if 1 + #include <unistd.h> + #endif + Added: head/misc/magicpoint/files/patch-xwintoppm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-xwintoppm.c Sat Feb 18 09:59:30 2017 (r434338) @@ -0,0 +1,72 @@ +--- contrib/xwintoppm/xwintoppm.c.orig 1998-08-26 05:30:16 UTC ++++ contrib/xwintoppm/xwintoppm.c +@@ -139,6 +139,15 @@ long add_pixel_value = 0; + extern int (*_XErrorFunction)(); + extern int _XDefaultError(); + ++extern void outl(); ++ ++/* forwards */ ++void usage(void); ++void Error(char *string); ++void Window_Dump(Window window, FILE *out); ++int Image_Size(XImage *image); ++int Get_XColors(XWindowAttributes *win_info, XColor **colors); ++ + static long parse_long (s) + char *s; + { +@@ -155,11 +164,12 @@ static long parse_long (s) + return (thesign * retval); + } + ++int + main(argc, argv) + int argc; + char **argv; + { +- register i; ++ register int i; + Window target_win; + FILE *out_file = stdout; + Bool frame_only = False; +@@ -281,6 +291,7 @@ XColor **colors ; + * writting. + */ + ++void + Window_Dump(window, out) + Window window; + FILE *out; +@@ -609,6 +620,7 @@ Window_Dump(window, out) + /* + * Report the syntax for calling xwd. + */ ++void + usage() + { + fprintf (stderr, +@@ -623,6 +635,7 @@ usage() + * Error - Fatal xwd error. + */ + ++void + Error(string) + char *string; /* Error description string. */ + { +@@ -716,6 +729,7 @@ int Get_XColors(win_info, colors) + return ncolors ; + } + ++void + _swapshort (bp, n) + register char *bp; + register unsigned n; +@@ -731,6 +745,7 @@ _swapshort (bp, n) + } + } + ++void + _swaplong (bp, n) + register char *bp; + register unsigned n;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702180959.v1I9xVIn027702>