Index: head/misc/magicpoint/Makefile =================================================================== --- head/misc/magicpoint/Makefile (revision 434337) +++ head/misc/magicpoint/Makefile (revision 434338) @@ -1,105 +1,106 @@ # Created by: itojun@itojun.org # $FreeBSD$ PORTNAME= magicpoint PORTVERSION= 1.13a -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES?= misc MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ MAINTAINER= dinoex@FreeBSD.org COMMENT= X11-based presentation tool LICENSE= BSD3CLAUSE LIB_DEPENDS+= libpng.so:graphics/png \ libmng.so:graphics/libmng RUN_DEPENDS+= pnmscale:graphics/netpbm MAKE_JOBS_UNSAFE= yes USES= imake:env perl5 pkgconfig USE_PERL5= run USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-vflib --enable-locale CONFIGURE_ENV= mgp_cv_path_perl=${PERL} CPPFLAGS+= -I.. LATE_INSTALL_ARGS= install.man PORTDOCS= ${DOCS} sample emacs-lisp scripts DOCS= COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \ README.fonts.jp README.lang RELNOTES SYNTAX TODO.jp \ USAGE USAGE.jp SAMPLES= README README.jp cloud.jpg dad.eps dad.jpg default.mgp \ embed-jp.mgp embed.mgp gradation-jp.mgp \ gradation.mgp mgp-old1.jpg mgp-old2.jpg mgp-old3.jpg \ mgp.mng mgp1.jpg mgp2.jpg mgp3.jpg mgp3.xbm mgprc-sample \ multilingual.mgp sample-fr.mgp sample-jp.mgp sample.mgp \ sendmail6-jp.mgp sendmail6.mgp tutorial-jp.mgp \ tutorial.mgp v6-jp.mgp v6.mgp v6header.eps v6header.jpg EMACS_LISPS= mgp-mode.el EMACS_LISPS_MGP=COPYING README mgp.el mgp.sty sample.tex SAMPLE_SCRIPTS= eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl OPTIONS_DEFINE= FREETYPE XFT GIF DOCS OPTIONS_DEFAULT=XFT GIF NO_OPTIONS_SORT=yes FREETYPE_PREVENTS= XFT FREETYPE_CONFIGURE_ENABLE= freetype FREETYPE_LIB_DEPENDS= libttf.so:print/freetype XFT_PREVENTS= FREETYPE XFT_USES= iconv XFT_USE= XORG=xft XFT_CONFIGURE_ENABLE= xft2 XFT_CONFIGURE_ON= --enable-freetype-charset16 GIF_CONFIGURE_ENABLE= gif GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CPPFLAGS= -I${LOCALBASE}/include post-patch: ${REINPLACE_CMD} -e 's|-lungif|-lgif|' \ -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ ${WRKSRC}/configure post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS} cd ${WRKSRC}/contrib/xmindpath && \ ${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX} ${REINPLACE_CMD} -e 's|freetype1/freetype|freetype1|g' \ ${WRKSRC}/Makefile ${WRKSRC}/image/Makefile post-build: cd ${WRKSRC}/contrib/xmindpath && \ ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: ${INSTALL_MAN} ${WRKSRC}/contrib/xmindpath/xmindpath.1 \ ${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} cd ${WRKSRC} && \ ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/sample cd ${WRKSRC}/sample && \ ${INSTALL_DATA} ${SAMPLES} ${STAGEDIR}${DOCSDIR}/sample/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp cd ${WRKSRC}/contrib && \ ${INSTALL_DATA} ${EMACS_LISPS} \ ${STAGEDIR}${DOCSDIR}/emacs-lisp/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el cd ${WRKSRC}/contrib/mgp-el && \ ${INSTALL_DATA} ${EMACS_LISPS_MGP} \ ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts cd ${WRKSRC}/contrib && \ ${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} \ ${STAGEDIR}${DOCSDIR}/scripts/ .include Index: head/misc/magicpoint/files/patch-configure =================================================================== --- head/misc/magicpoint/files/patch-configure (revision 434337) +++ head/misc/magicpoint/files/patch-configure (revision 434338) @@ -1,11 +1,11 @@ ---- 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" + elif test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then + ac_cv_ft_include="$dir/include/freetype1/freetype" elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then ac_cv_ft_include="$dir/include/freetype" fi Index: head/misc/magicpoint/files/patch-ctlwords.c =================================================================== --- head/misc/magicpoint/files/patch-ctlwords.c (revision 434337) +++ head/misc/magicpoint/files/patch-ctlwords.c (revision 434338) @@ -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 #include +#include ++#include main(int argc, char *argv[]) { Index: head/misc/magicpoint/files/patch-default.mgp =================================================================== --- head/misc/magicpoint/files/patch-default.mgp (revision 434337) +++ head/misc/magicpoint/files/patch-default.mgp (revision 434338) @@ -1,15 +1,15 @@ ---- 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 %% -%deffont "standard" tfont "standard.ttf", tmfont "kochi-mincho.ttf" -%deffont "thick" tfont "thick.ttf", tmfont "goth.ttf" -%deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf" +%deffont "standard" xfont "Times", xfont "IPAMincho" "jisx0208.1983-*" +%deffont "thick" xfont "Helvetica", xfont "IPAGothic" "jisx0208.1983-*" +%deffont "typewriter" xfont "Courier", xfont "IPAGothic" "jisx0208.1983-*" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% Default settings per each line numbers. Index: head/misc/magicpoint/files/patch-draw.c =================================================================== --- head/misc/magicpoint/files/patch-draw.c (revision 434337) +++ head/misc/magicpoint/files/patch-draw.c (revision 434338) @@ -1,17 +1,17 @@ ---- 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, - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0); + XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, NULL); } else { xftfont = XftFontOpen(display, screen, XFT_FAMILY, XftTypeString, font, XFT_ENCODING, XftTypeString, registry, - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0); + XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, NULL); } if (xftfont == 0) { free(xfont); Index: head/misc/magicpoint/files/patch-dsimple.c =================================================================== --- head/misc/magicpoint/files/patch-dsimple.c (nonexistent) +++ head/misc/magicpoint/files/patch-dsimple.c (revision 434338) @@ -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; Property changes on: head/misc/magicpoint/files/patch-dsimple.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/magicpoint/files/patch-grammar.y =================================================================== --- head/misc/magicpoint/files/patch-grammar.y (nonexistent) +++ head/misc/magicpoint/files/patch-grammar.y (revision 434338) @@ -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; Property changes on: head/misc/magicpoint/files/patch-grammar.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/magicpoint/files/patch-main.c =================================================================== --- head/misc/magicpoint/files/patch-main.c (nonexistent) +++ head/misc/magicpoint/files/patch-main.c (revision 434338) @@ -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 + #include + #include ++#include ++#include ++#include ++#include + + #ifdef X_DISPLAY_MISSING + # error this program cannot be compiled without X11. Property changes on: head/misc/magicpoint/files/patch-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/magicpoint/files/patch-mgp.h =================================================================== --- head/misc/magicpoint/files/patch-mgp.h (revision 434337) +++ head/misc/magicpoint/files/patch-mgp.h (revision 434338) @@ -1,11 +1,19 @@ ---- 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 */ #ifdef FREETYPE -#include "freetype.h" +#include "freetype/freetype.h" #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); ++ Index: head/misc/magicpoint/files/patch-new.c =================================================================== --- head/misc/magicpoint/files/patch-new.c (revision 434337) +++ head/misc/magicpoint/files/patch-new.c (revision 434338) @@ -1,11 +1,11 @@ ---- 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" -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(CSRG_BASED) #include #else #include Index: head/misc/magicpoint/files/patch-path.c =================================================================== --- head/misc/magicpoint/files/patch-path.c (nonexistent) +++ head/misc/magicpoint/files/patch-path.c (revision 434338) @@ -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 + #endif +-#ifdef __APPLE__ ++#if 1 + #include + #endif + Property changes on: head/misc/magicpoint/files/patch-path.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/magicpoint/files/patch-png.c =================================================================== --- head/misc/magicpoint/files/patch-png.c (revision 434337) +++ head/misc/magicpoint/files/patch-png.c (revision 434338) @@ -1,20 +1,20 @@ ---- 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; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { 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){ - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); } if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)){ Index: head/misc/magicpoint/files/patch-rlelib.c =================================================================== --- head/misc/magicpoint/files/patch-rlelib.c (revision 434337) +++ head/misc/magicpoint/files/patch-rlelib.c (revision 434338) @@ -1,11 +1,11 @@ ---- 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 #include #if 0 -#include +#include #endif #include Index: head/misc/magicpoint/files/patch-window.c =================================================================== --- head/misc/magicpoint/files/patch-window.c (nonexistent) +++ head/misc/magicpoint/files/patch-window.c (revision 434338) @@ -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 + #endif +-#ifdef __APPLE__ ++#if 1 + #include + #endif + Property changes on: head/misc/magicpoint/files/patch-window.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/magicpoint/files/patch-xwintoppm.c =================================================================== --- head/misc/magicpoint/files/patch-xwintoppm.c (nonexistent) +++ head/misc/magicpoint/files/patch-xwintoppm.c (revision 434338) @@ -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; Property changes on: head/misc/magicpoint/files/patch-xwintoppm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property