Wed Sep 10 13:32:48 2008 UTC ()
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
(taca)
diff -r1.61 -r1.62 pkgsrc/graphics/magicpoint/Makefile
diff -r1.2 -r1.3 pkgsrc/graphics/magicpoint/PLIST
diff -r1.15 -r1.16 pkgsrc/graphics/magicpoint/distinfo
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/options.mk
diff -r1.10 -r1.11 pkgsrc/graphics/magicpoint/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/graphics/magicpoint/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/graphics/magicpoint/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/graphics/magicpoint/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/graphics/magicpoint/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/graphics/magicpoint/patches/patch-af
diff -r1.1 -r1.2 pkgsrc/graphics/magicpoint/patches/patch-ag
diff -r1.1 -r1.2 pkgsrc/graphics/magicpoint/patches/patch-al
diff -r1.1 -r1.2 pkgsrc/graphics/magicpoint/patches/patch-am
diff -r1.1 -r0 pkgsrc/graphics/magicpoint/patches/patch-ah
diff -r1.1 -r0 pkgsrc/graphics/magicpoint/patches/patch-ak
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-an
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-ao
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-ap
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-aq
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-ar
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-as
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-at
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-au
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-av
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-aw
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-ax
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-ay
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-az
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-ba
diff -r0 -r1.1 pkgsrc/graphics/magicpoint/patches/patch-bb
--- pkgsrc/graphics/magicpoint/Makefile 2008/05/24 13:53:33 1.61
+++ pkgsrc/graphics/magicpoint/Makefile 2008/09/10 13:32:47 1.62
| @@ -1,87 +1,78 @@ | | | @@ -1,87 +1,78 @@ |
1 | # $NetBSD: Makefile,v 1.61 2008/05/24 13:53:33 tnn Exp $ | | 1 | # $NetBSD: Makefile,v 1.62 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | DISTNAME= magicpoint-1.10a | | 3 | DISTNAME= magicpoint-1.13a |
4 | PKGREVISION= 11 | | | |
5 | #DISTNAME= magicpoint-1.11b.tar.gz | | | |
6 | CATEGORIES= x11 graphics | | 4 | CATEGORIES= x11 graphics |
7 | MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ | | 5 | MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ |
8 | | | 6 | |
9 | MAINTAINER= pkgsrc-users@NetBSD.org | | 7 | MAINTAINER= pkgsrc-users@NetBSD.org |
10 | HOMEPAGE= http://member.wide.ad.jp/wg/mgp/ | | 8 | HOMEPAGE= http://member.wide.ad.jp/wg/mgp/ |
11 | COMMENT= X11 based presentation tool | | 9 | COMMENT= X11 based presentation tool |
12 | | | 10 | |
13 | CONFLICTS= mgp-[0-9]* | | 11 | CONFLICTS= mgp-[0-9]* |
14 | | | 12 | |
15 | GNU_CONFIGURE= yes | | 13 | GNU_CONFIGURE= yes |
16 | USE_IMAKE= yes | | 14 | USE_IMAKE= yes |
17 | USE_LANGUAGES+= c99 | | 15 | USE_LANGUAGES+= c99 |
18 | USE_TOOLS+= perl | | 16 | USE_TOOLS+= perl |
19 | USE_TOOLS+= pkg-config | | 17 | USE_TOOLS+= pkg-config |
20 | | | 18 | |
21 | PKG_OPTIONS_VAR= PKG_OPTIONS.magicpoint | | | |
22 | PKG_SUPPORTED_OPTIONS= freetype vflib xft2 | | | |
23 | PKG_SUGGESTED_OPTIONS= xft2 | | | |
24 | | | | |
25 | .include "../../mk/bsd.options.mk" | | | |
26 | | | | |
27 | CONFIGURE_ARGS+= --enable-freetype-charset16 | | 19 | CONFIGURE_ARGS+= --enable-freetype-charset16 |
28 | CONFIGURE_ARGS+= --enable-locale | | 20 | CONFIGURE_ARGS+= --enable-locale |
29 | CONFIGURE_ARGS+= --enable-gif | | 21 | CONFIGURE_ARGS+= --enable-gif |
| | | 22 | CONFIGURE_ARGS+= --with-searchpath=${BUILDLINK_DIR:Q} |
30 | CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} | | 23 | CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} |
31 | CONFIGURE_ENV+= mgp_cv_path_perl=${TOOLS_PERL5:Q} | | 24 | CONFIGURE_ENV+= mgp_cv_path_perl=${TOOLS_PERL5:Q} |
32 | | | 25 | |
33 | MGP_RENDERING_ENGINES= freetype graphics/freetype-lib \ | | 26 | DOCDIR= share/doc/mgp |
34 | xft2 x11/libXft \ | | 27 | EGDIR= share/examples/mgp |
35 | vflib print/ja-vflib-lib | | 28 | INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} |
| | | 29 | |
| | | 30 | DOCS= COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \ |
| | | 31 | README.fonts.jp README.lang SYNTAX USAGE USAGE.jp |
| | | 32 | EXAMPLES= README README.jp cloud.jpg dad.eps dad.jpg \ |
| | | 33 | default.mgp embed-jp.mgp embed.mgp gradation-jp.mgp \ |
| | | 34 | gradation.mgp m17n-lib.mgp mgp-old1.jpg mgp-old2.jpg \ |
| | | 35 | mgp-old3.jpg mgp1.jpg mgp2.jpg mgp3.jpg mgp3.xbm \ |
| | | 36 | mgprc-sample multilingual.mgp sample-fr.mgp \ |
| | | 37 | sample-jp-xft.mgp sample-jp.mgp sample.mgp \ |
| | | 38 | sendmail6-jp.mgp sendmail6.mgp tutorial-jp.mgp \ |
| | | 39 | tutorial.mgp v6-jp.mgp v6.mgp v6header.eps v6header.jpg |
36 | | | 40 | |
37 | # We need to perform the steps normally done by ``xmkmf -a'' since some | | 41 | # We need to perform the steps normally done by ``xmkmf -a'' since some |
38 | # files need to be created before ``make depend''. | | 42 | # files need to be created before ``make depend''. |
39 | # | | 43 | # |
40 | XMKMF= ${XMKMF_CMD} ${XMKMF_FLAGS} | | 44 | XMKMF= ${XMKMF_CMD} ${XMKMF_FLAGS} |
41 | | | 45 | |
42 | MGP_PRE_STAGE= ctlwords.h grammar.c scanner.c tokdefs.h \ | | 46 | MGP_PRE_STAGE= ctlwords.h grammar.c scanner.c tokdefs.h \ |
43 | Makefiles includes depend | | 47 | Makefiles includes depend |
44 | | | 48 | |
| | | 49 | .include "options.mk" |
| | | 50 | |
| | | 51 | SUBST_CLASSES+= conf |
| | | 52 | SUBST_FILES.conf+= sample/default.mgp |
| | | 53 | SUBST_SED.conf+= -e 's|@MGP_TFONT@|${MGP_TFONT}|g' |
| | | 54 | SUBST_SED.conf+= -e 's|@MGP_VFONT@|${MGP_VFONT}|g' |
| | | 55 | SUBST_SED.conf+= -e 's|@MGP_XFONT@|${MGP_XFONT}|g' |
| | | 56 | SUBST_STAGE.conf= post-configure |
| | | 57 | |
45 | post-configure: | | 58 | post-configure: |
46 | .for s in ${MGP_PRE_STAGE} | | 59 | .for s in ${MGP_PRE_STAGE} |
47 | cd ${WRKSRC}; \ | | 60 | cd ${WRKSRC}; \ |
48 | ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${s} | | 61 | ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${s} |
49 | .endfor | | 62 | .endfor |
50 | | | 63 | |
51 | pre-install: | | | |
52 | ${SED} -e "/^%% Default.*${PKG_OPTIONS}\./,/^%%%/s/^%% %/%/" \ | | | |
53 | ${WRKSRC}/sample/default.mgp.template > \ | | | |
54 | ${WRKSRC}/sample/default.mgp | | | |
55 | | | | |
56 | post-install: | | 64 | post-install: |
57 | ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgp | | 65 | .for f in ${DOCS} |
58 | cd ${WRKSRC}; \ | | 66 | ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR} |
59 | for f in COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \ | | 67 | .endfor |
60 | README.fonts.jp README.lang SYNTAX USAGE USAGE.jp; do \ | | 68 | .for f in ${EXAMPLES} |
61 | ${INSTALL_DATA} $$f ${PREFIX}/share/doc/mgp; \ | | 69 | ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${DESTDIR}${PREFIX}/${EGDIR} |
62 | done | | | |
63 | ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mgp | | | |
64 | cd ${WRKSRC}/sample; \ | | | |
65 | for f in README* *.jpg *.eps *.mgp *.xbm mgprc-sample; do \ | | | |
66 | ${INSTALL_DATA} $$f ${PREFIX}/share/examples/mgp; \ | | | |
67 | done | | | |
68 | | | | |
69 | .for engine pkg in ${MGP_RENDERING_ENGINES} | | | |
70 | . if !empty(PKG_OPTIONS:M${engine}) | | | |
71 | CONFIGURE_ARGS+= --enable-${engine} | | | |
72 | .include "../../${pkg}/buildlink3.mk" | | | |
73 | . else | | | |
74 | CONFIGURE_ARGS+= --disable-${engine} | | | |
75 | . endif | | | |
76 | .endfor | | 70 | .endfor |
77 | | | 71 | |
78 | .if !empty(PKG_OPTIONS:Mxft2) | | | |
79 | .include "../../graphics/freetype2/buildlink3.mk" | | | |
80 | .endif | | | |
81 | .include "../../graphics/libungif/buildlink3.mk" | | 72 | .include "../../graphics/libungif/buildlink3.mk" |
82 | .include "../../graphics/mng/buildlink3.mk" | | 73 | .include "../../graphics/mng/buildlink3.mk" |
83 | .include "../../graphics/netpbm/buildlink3.mk" | | 74 | .include "../../graphics/netpbm/buildlink3.mk" |
84 | .include "../../graphics/png/buildlink3.mk" | | 75 | .include "../../graphics/png/buildlink3.mk" |
85 | .include "../../x11/libXext/buildlink3.mk" | | 76 | .include "../../x11/libXext/buildlink3.mk" |
86 | .include "../../x11/libXmu/buildlink3.mk" | | 77 | .include "../../x11/libXmu/buildlink3.mk" |
87 | .include "../../mk/bsd.pkg.mk" | | 78 | .include "../../mk/bsd.pkg.mk" |
--- pkgsrc/graphics/magicpoint/PLIST 2003/03/02 19:47:23 1.2
+++ pkgsrc/graphics/magicpoint/PLIST 2008/09/10 13:32:47 1.3
| @@ -1,58 +1,60 @@ | | | @@ -1,58 +1,60 @@ |
1 | @comment $NetBSD: PLIST,v 1.2 2003/03/02 19:47:23 jschauma Exp $ | | 1 | @comment $NetBSD: PLIST,v 1.3 2008/09/10 13:32:47 taca Exp $ |
2 | bin/mgp | | 2 | bin/mgp |
3 | bin/mgp2ps | | 3 | bin/mgp2ps |
4 | bin/mgpembed | | 4 | bin/mgpembed |
5 | bin/mgpnet | | 5 | bin/mgpnet |
6 | bin/xwintoppm | | 6 | bin/xwintoppm |
7 | lib/X11/mgp/default.mgp | | 7 | lib/X11/mgp/default.mgp |
8 | lib/X11/mgp/mgp1.jpg | | 8 | lib/X11/mgp/mgp1.jpg |
9 | lib/X11/mgp/mgp2.jpg | | 9 | lib/X11/mgp/mgp2.jpg |
10 | lib/X11/mgp/mgp3.jpg | | 10 | lib/X11/mgp/mgp3.jpg |
11 | ${IMAKE_MAN_DIR}/mgp.${IMAKE_MANNEWSUFFIX} | | 11 | ${IMAKE_MAN_DIR}/mgp.${IMAKE_MANNEWSUFFIX} |
12 | ${IMAKE_MAN_DIR}/mgp2ps.${IMAKE_MANNEWSUFFIX} | | 12 | ${IMAKE_MAN_DIR}/mgp2ps.${IMAKE_MANNEWSUFFIX} |
13 | ${IMAKE_MAN_DIR}/mgpembed.${IMAKE_MANNEWSUFFIX} | | 13 | ${IMAKE_MAN_DIR}/mgpembed.${IMAKE_MANNEWSUFFIX} |
14 | ${IMAKE_MAN_DIR}/mgpnet.${IMAKE_MANNEWSUFFIX} | | 14 | ${IMAKE_MAN_DIR}/mgpnet.${IMAKE_MANNEWSUFFIX} |
15 | ${IMAKE_MAN_DIR}/xwintoppm.${IMAKE_MANNEWSUFFIX} | | 15 | ${IMAKE_MAN_DIR}/xwintoppm.${IMAKE_MANNEWSUFFIX} |
16 | share/doc/mgp/COPYRIGHT | | 16 | share/doc/mgp/COPYRIGHT |
17 | share/doc/mgp/COPYRIGHT.jp | | 17 | share/doc/mgp/COPYRIGHT.jp |
18 | share/doc/mgp/FAQ | | 18 | share/doc/mgp/FAQ |
19 | share/doc/mgp/README | | 19 | share/doc/mgp/README |
20 | share/doc/mgp/README.fonts | | 20 | share/doc/mgp/README.fonts |
21 | share/doc/mgp/README.fonts.jp | | 21 | share/doc/mgp/README.fonts.jp |
22 | share/doc/mgp/README.lang | | 22 | share/doc/mgp/README.lang |
23 | share/doc/mgp/SYNTAX | | 23 | share/doc/mgp/SYNTAX |
24 | share/doc/mgp/USAGE | | 24 | share/doc/mgp/USAGE |
25 | share/doc/mgp/USAGE.jp | | 25 | share/doc/mgp/USAGE.jp |
26 | share/examples/mgp/README | | 26 | share/examples/mgp/README |
27 | share/examples/mgp/README.jp | | 27 | share/examples/mgp/README.jp |
28 | share/examples/mgp/cloud.jpg | | 28 | share/examples/mgp/cloud.jpg |
29 | share/examples/mgp/dad.eps | | 29 | share/examples/mgp/dad.eps |
30 | share/examples/mgp/dad.jpg | | 30 | share/examples/mgp/dad.jpg |
31 | share/examples/mgp/default.mgp | | 31 | share/examples/mgp/default.mgp |
32 | share/examples/mgp/embed-jp.mgp | | 32 | share/examples/mgp/embed-jp.mgp |
33 | share/examples/mgp/embed.mgp | | 33 | share/examples/mgp/embed.mgp |
34 | share/examples/mgp/gradation-jp.mgp | | 34 | share/examples/mgp/gradation-jp.mgp |
35 | share/examples/mgp/gradation.mgp | | 35 | share/examples/mgp/gradation.mgp |
| | | 36 | share/examples/mgp/m17n-lib.mgp |
36 | share/examples/mgp/mgp-old1.jpg | | 37 | share/examples/mgp/mgp-old1.jpg |
37 | share/examples/mgp/mgp-old2.jpg | | 38 | share/examples/mgp/mgp-old2.jpg |
38 | share/examples/mgp/mgp-old3.jpg | | 39 | share/examples/mgp/mgp-old3.jpg |
39 | share/examples/mgp/mgp1.jpg | | 40 | share/examples/mgp/mgp1.jpg |
40 | share/examples/mgp/mgp2.jpg | | 41 | share/examples/mgp/mgp2.jpg |
41 | share/examples/mgp/mgp3.jpg | | 42 | share/examples/mgp/mgp3.jpg |
42 | share/examples/mgp/mgp3.xbm | | 43 | share/examples/mgp/mgp3.xbm |
43 | share/examples/mgp/mgprc-sample | | 44 | share/examples/mgp/mgprc-sample |
44 | share/examples/mgp/multilingual.mgp | | 45 | share/examples/mgp/multilingual.mgp |
45 | share/examples/mgp/sample-fr.mgp | | 46 | share/examples/mgp/sample-fr.mgp |
46 | share/examples/mgp/sample-jp.mgp | | 47 | share/examples/mgp/sample-jp.mgp |
| | | 48 | share/examples/mgp/sample-jp-xft.mgp |
47 | share/examples/mgp/sample.mgp | | 49 | share/examples/mgp/sample.mgp |
48 | share/examples/mgp/sendmail6-jp.mgp | | 50 | share/examples/mgp/sendmail6-jp.mgp |
49 | share/examples/mgp/sendmail6.mgp | | 51 | share/examples/mgp/sendmail6.mgp |
50 | share/examples/mgp/tutorial-jp.mgp | | 52 | share/examples/mgp/tutorial-jp.mgp |
51 | share/examples/mgp/tutorial.mgp | | 53 | share/examples/mgp/tutorial.mgp |
52 | share/examples/mgp/v6-jp.mgp | | 54 | share/examples/mgp/v6-jp.mgp |
53 | share/examples/mgp/v6.mgp | | 55 | share/examples/mgp/v6.mgp |
54 | share/examples/mgp/v6header.eps | | 56 | share/examples/mgp/v6header.eps |
55 | share/examples/mgp/v6header.jpg | | 57 | share/examples/mgp/v6header.jpg |
56 | @dirrm share/examples/mgp | | 58 | @dirrm share/examples/mgp |
57 | @dirrm share/doc/mgp | | 59 | @dirrm share/doc/mgp |
58 | @dirrm lib/X11/mgp | | 60 | @dirrm lib/X11/mgp |
--- pkgsrc/graphics/magicpoint/distinfo 2006/02/23 20:49:49 1.15
+++ pkgsrc/graphics/magicpoint/distinfo 2008/09/10 13:32:47 1.16
| @@ -1,18 +1,31 @@ | | | @@ -1,18 +1,31 @@ |
1 | $NetBSD: distinfo,v 1.15 2006/02/23 20:49:49 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.16 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | SHA1 (magicpoint-1.10a.tar.gz) = 7510ee965316cb52eac7a430f0e19a87a337fe5c | | 3 | SHA1 (magicpoint-1.13a.tar.gz) = 2bc662ad0a482d42578766258a143b06a4718ae3 |
4 | RMD160 (magicpoint-1.10a.tar.gz) = 167bf8b57bd4bb98c8f4fdba82a5733dda1f8a6a | | 4 | RMD160 (magicpoint-1.13a.tar.gz) = 067d7dee3b90ec354975d9ad4ea0c0df48cca191 |
5 | Size (magicpoint-1.10a.tar.gz) = 843657 bytes | | 5 | Size (magicpoint-1.13a.tar.gz) = 890670 bytes |
6 | SHA1 (patch-aa) = f4d97279e878a58900ceff5ea07c61ca678e61f5 | | 6 | SHA1 (patch-aa) = 7270255c2002c66d10ab911ed22ce67067183e17 |
7 | SHA1 (patch-ab) = 0553e8369f3337e53ecd8a8926ceeed9757953b8 | | 7 | SHA1 (patch-ab) = eb6558d6981e5d5f41f55dddc1b3debc9ca27d36 |
8 | SHA1 (patch-ac) = 1b2de41c2a8da28c9023552eff676c40069630fe | | 8 | SHA1 (patch-ac) = 9442e1893475ff53180f7facce0f31bf2e412759 |
9 | SHA1 (patch-ad) = d6dd11bee4091de4f1c8d5fffa61987d16a063e1 | | 9 | SHA1 (patch-ad) = 33c8fa61cb03cb53ad8783d2d79fa457cb21d235 |
10 | SHA1 (patch-ae) = c293c8f9c406fe8f090378b328b6bdbe89050eee | | 10 | SHA1 (patch-ae) = ca59b94955f2de6f19ea1e2210ede7eaeba50a95 |
11 | SHA1 (patch-af) = b52455c3018d5de4ee7d20c42680df8978f15b55 | | 11 | SHA1 (patch-af) = 615e845dfbeba9b35c5a138841962631dac3b4bb |
12 | SHA1 (patch-ag) = 02e53e3e498b150d528349c9712978f164e8836f | | 12 | SHA1 (patch-ag) = 96d7cac9157b9183dd2ba76b12f0927fc15dd5a6 |
13 | SHA1 (patch-ah) = 2cd87d9697be2ebd9d7c0a936d49583286de62d3 | | | |
14 | SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b | | 13 | SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b |
15 | SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004 | | 14 | SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004 |
16 | SHA1 (patch-ak) = bb1364f9fec905e09eb7453a4bc0a8cab557b3b3 | | 15 | SHA1 (patch-al) = 25faf28b240d90ead9a4283e46d1461118c509df |
17 | SHA1 (patch-al) = a0956fc353d38f937d3829fa0e6cd70c9cb60faa | | 16 | SHA1 (patch-am) = dcc58a02946353262a78d5dfd81f81b25990019e |
18 | SHA1 (patch-am) = ba255a9e749f627d777cebbd29521b8c368d69dc | | 17 | SHA1 (patch-an) = f5e3158b972feb20bf464e57c703e871537d074e |
| | | 18 | SHA1 (patch-ao) = 64ba2d7ceaf6429f4bb8b88bebb26a83c12fbacd |
| | | 19 | SHA1 (patch-ap) = 6c81429affe9dce518c304178dd6dfe571e5e44c |
| | | 20 | SHA1 (patch-aq) = 1c67df7538626e9a497e702e246291155417892a |
| | | 21 | SHA1 (patch-ar) = 8279fba385c3013626aa74401201e37246c9cc82 |
| | | 22 | SHA1 (patch-as) = 05a1f6ab546127a94a34fd371c455461a46ffdd7 |
| | | 23 | SHA1 (patch-at) = 61a70481cbc370589f695109d9a593c97644617b |
| | | 24 | SHA1 (patch-au) = 9c15ef5fa369d4513a46192eeea1b7c4a73bce8e |
| | | 25 | SHA1 (patch-av) = 05d19e06a2f1341da063da537d46232e99fae35d |
| | | 26 | SHA1 (patch-aw) = 44e83a46c170b632ec576995fc6a0b752a4caf42 |
| | | 27 | SHA1 (patch-ax) = 130159e6b03f5d6acf39de108c91dbb87302832a |
| | | 28 | SHA1 (patch-ay) = 4c618b7c51f8b41a472ddd6cba938a2ccb3d91e1 |
| | | 29 | SHA1 (patch-az) = 893ec7e21199205c07933d5525a6eb394114fd11 |
| | | 30 | SHA1 (patch-ba) = 938e5714ddfcb8ca64d1cc6f756eeb69e592905d |
| | | 31 | SHA1 (patch-bb) = 3a6c328adcb49aef0d4792ceff08407fcbc80c16 |
# $NetBSD: options.mk,v 1.1 2008/09/10 13:32:47 taca Exp $
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.magicpoint
PKG_SUPPORTED_OPTIONS= freetype vflib xft2
PKG_SUGGESTED_OPTIONS= xft2
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mfreetype)
CONFIGURE_ARGS+= --enable-freetype
MGP_TFONT= % %
MGP_VFONT= # empty
.include "../../graphics/freetype-lib/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-freetype
.endif
.if !empty(PKG_OPTIONS:Mvflib)
CONFIGURE_ARGS+= --enable-vflib
MGP_TFONT= # empty
MGP_VFONT= % %
.include "../../print/ja-vflib-lib/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-vflib
.endif
.if !empty(PKG_OPTIONS:Mxft2)
CONFIGURE_ARGS+= --enable-xft2
MGP_XFONT= # empty
MGP_TFONT= % %
MGP_VFONT= % %
.include "../../x11/libXft/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-xft2
.endif
.include "../../graphics/imlib/buildlink3.mk"
#
# fall back defaults
#
MGP_VFONT?= % %
MGP_TFONT?= % %
MGP_XFONT?= % %
--- pkgsrc/graphics/magicpoint/patches/patch-aa 2004/01/12 15:19:28 1.10
+++ pkgsrc/graphics/magicpoint/patches/patch-aa 2008/09/10 13:32:47 1.11
| @@ -1,121 +1,141 @@ | | | @@ -1,121 +1,141 @@ |
1 | $NetBSD: patch-aa,v 1.10 2004/01/12 15:19:28 wennmach Exp $ | | 1 | $NetBSD: patch-aa,v 1.11 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2003-05-28 14:34:23.000000000 +0900 | | 3 | --- configure.orig 2007-12-29 05:31:26.000000000 +0900 |
4 | +++ configure 2004-01-11 04:18:35.000000000 +0900 | | 4 | +++ configure |
5 | @@ -4108,7 +4108,7 @@ | | 5 | @@ -5090,7 +5090,7 @@ if test "$mgp_use_freetype" = "yes"; the |
6 | # XXX: freetype2 may use freetype-config | | 6 | # XXX: freetype2 may use freetype-config |
7 | echo "$as_me:$LINENO: checking for freetype1 library/header" >&5 | | 7 | { echo "$as_me:$LINENO: checking for freetype1 library/header" >&5 |
8 | echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6 | | 8 | echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6; } |
9 | - for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 ; do | | 9 | - for dir in $SEARCHPATH /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 /sw; do |
10 | + for dir in ${BUILDLINK_DIR}; do | | 10 | + for dir in ${BUILDLINK_DIR}; do |
11 | ac_cv_ft_lib=no | | 11 | ac_cv_ft_lib=no |
12 | ac_cv_ft_include=no | | 12 | ac_cv_ft_include=no |
13 | shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` | | 13 | shlib=`echo $dir/lib/libttf.$SHLIBEXT* | head -n 1 | sed -e 's/.*\///'` |
14 | @@ -4379,15 +4379,13 @@ | | 14 | @@ -5384,7 +5384,7 @@ echo "${ECHO_T}$mgp_use_vflib" >&6; } |
15 | echo "$as_me:$LINENO: result: $mgp_use_xft2" >&5 | | | |
16 | echo "${ECHO_T}$mgp_use_xft2" >&6 | | | |
17 | if test "$mgp_use_xft2" = "yes"; then | | | |
18 | - if type pkg-config > /dev/null 2>&1; then | | | |
19 | - if pkg-config xft; then | | | |
20 | - OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS" | | | |
21 | - LIBS="$LIBS `pkg-config --libs xft`" | | | |
22 | - cat >>confdefs.h <<\_ACEOF | | | |
23 | + if type pkg-config > /dev/null 2>&1 && pkg-config xft; then | | | |
24 | + OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS" | | | |
25 | + LIBS="$LIBS `pkg-config --libs xft`" | | | |
26 | + cat >>confdefs.h <<\_ACEOF | | | |
27 | #define USE_XFT2 1 | | | |
28 | _ACEOF | | | |
29 | | | | |
30 | - fi | | | |
31 | else | | | |
32 | echo "$as_me:$LINENO: checking for xft2 and ft2 and fc header.." >&5 | | | |
33 | echo $ECHO_N "checking for xft2 and ft2 and fc header..... $ECHO_C" >&6 | | | |
34 | @@ -4643,7 +4641,7 @@ | | | |
35 | if test "$mgp_use_vflib" = "yes"; then | | 15 | if test "$mgp_use_vflib" = "yes"; then |
36 | echo "$as_me:$LINENO: checking for VFlib library/header" >&5 | | 16 | { echo "$as_me:$LINENO: checking for VFlib library/header" >&5 |
37 | echo $ECHO_N "checking for VFlib library/header... $ECHO_C" >&6 | | 17 | echo $ECHO_N "checking for VFlib library/header... $ECHO_C" >&6; } |
38 | - for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr; do | | 18 | - for dir in $SEARCHPATH /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr; do |
39 | + for dir in ${BUILDLINK_DIR}; do | | 19 | + for dir in ${BUILDLINK_DIR}; do |
40 | ac_cv_vf_libname=VFlib | | 20 | ac_cv_vf_libname=VFlib |
41 | ac_cv_vf_libdir=no | | 21 | ac_cv_vf_libdir=no |
42 | ac_cv_vf_hdrdir=no | | 22 | ac_cv_vf_hdrdir=no |
43 | @@ -4815,6 +4813,7 @@ | | 23 | @@ -5562,12 +5562,7 @@ fi |
44 | /usr/local/lib /usr/local/etc /etc \ | | 24 | if test -f "$with_vfontcap"; then |
45 | /usr/local/libdata/vflib /usr/local/share/VFlib \ | | 25 | ac_cv_vf_fontcap=$with_vfontcap; |
46 | /usr/local/share/VFlib/* \ | | 26 | else |
47 | + ${prefix}/share/VFlib/* \ | | 27 | - for ac_dir in /usr/local/lib /usr/local/lib/tex \ |
48 | ../../VFlib* ../VFlib* VFlib*; do | | 28 | - /usr/local/lib/VFlib /usr/local/lib/fonts/vf \ |
| | | 29 | - /usr/local/lib /usr/local/etc /etc \ |
| | | 30 | - /usr/local/libdata/vflib /usr/local/share/VFlib \ |
| | | 31 | - /usr/local/share/VFlib/* \ |
| | | 32 | - ../../VFlib* ../VFlib* VFlib*; do |
| | | 33 | + for ac_dir in ${prefix}/share/VFlib/*; do |
49 | if test -d $ac_dir -a -f $ac_dir/vfontcap; then | | 34 | if test -d $ac_dir -a -f $ac_dir/vfontcap; then |
50 | ac_cv_vf_fontcap=$ac_dir/vfontcap; | | 35 | ac_cv_vf_fontcap=$ac_dir/vfontcap; |
51 | @@ -4857,17 +4856,15 @@ | | 36 | break |
| | | 37 | @@ -5609,22 +5604,17 @@ _ACEOF |
52 | fi | | 38 | fi |
53 | fi | | 39 | fi |
54 | | | 40 | |
55 | -if type pkg-config > /dev/null 2>&1; then | | 41 | -if type pkg-config > /dev/null 2>&1; then |
56 | - if pkg-config libpng; then | | 42 | - for pnglib in libpng libpng12 libpng10 |
57 | - LIBS="$LIBS `pkg-config --libs libpng`" | | 43 | - do |
58 | - OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`" | | 44 | - if pkg-config $pnglib; then |
59 | - cat >>confdefs.h <<\_ACEOF | | 45 | - LIBS="$LIBS `pkg-config --libs $pnglib`" |
| | | 46 | - OPTFLAGS="$OPTFLAGS `pkg-config --cflags $pnglib`" |
| | | 47 | - cat >>confdefs.h <<\_ACEOF |
60 | +if type pkg-config > /dev/null 2>&1 && pkg-config libpng; then | | 48 | +if type pkg-config > /dev/null 2>&1 && pkg-config libpng; then |
61 | + LIBS="$LIBS `pkg-config --libs libpng`" | | 49 | + LIBS="$LIBS `pkg-config --libs libpng`" |
62 | + OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`" | | 50 | + OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`" |
63 | + cat >>confdefs.h <<\_ACEOF | | 51 | + cat >>confdefs.h <<\_ACEOF |
64 | #define USE_PNG 1 | | 52 | #define USE_PNG 1 |
65 | _ACEOF | | 53 | _ACEOF |
66 | | | 54 | |
67 | - fi | | 55 | break |
68 | else | | 56 | - fi |
69 | - for i in /usr/pkg /usr/local /usr; do | | 57 | - done |
70 | + for i in ${BUILDLINK_DIR}; do | | 58 | fi |
| | | 59 | if test "$use_libpng" = ""; then |
| | | 60 | -for i in $SEARCHPATH /usr/pkg /usr/local /usr; do |
| | | 61 | +for i in ${BUILDLINK_DIR}; do |
71 | if test -f $i/include/png.h; then | | 62 | if test -f $i/include/png.h; then |
72 | if test -f $i/lib/libpng.a ; then | | 63 | if test -f $i/lib/libpng.a ; then |
73 | DEPLIBS="$DEPLIBS $i/lib/libpng.a" | | 64 | DEPLIBS="$DEPLIBS $i/lib/libpng.a" |
74 | @@ -5010,7 +5007,7 @@ | | 65 | @@ -5779,7 +5769,7 @@ fi |
75 | done | | 66 | done |
76 | fi | | 67 | fi |
77 | | | 68 | |
78 | -for i in /usr/pkg /usr/local /usr; do | | 69 | -for i in /usr/pkg /usr/local /usr; do |
79 | +for i in ${BUILDLINK_DIR}; do | | 70 | +for i in ${BUILDLINK_DIR}; do |
80 | if test -f $i/include/libmng.h; then | | 71 | if test -f $i/include/libmng.h; then |
81 | if test -f $i/lib/libmng.a ; then | | 72 | if test -f $i/lib/libmng.a ; then |
82 | DEPLIBS="$DEPLIBS $i/lib/libmng.a" | | 73 | DEPLIBS="$DEPLIBS $i/lib/libmng.a" |
83 | @@ -5647,7 +5644,7 @@ | | 74 | @@ -6193,23 +6183,19 @@ fi |
| | | 75 | { echo "$as_me:$LINENO: result: $mgp_use_xft2" >&5 |
| | | 76 | echo "${ECHO_T}$mgp_use_xft2" >&6; } |
| | | 77 | if test "$mgp_use_xft2" = "yes"; then |
| | | 78 | - if type pkg-config > /dev/null 2>&1; then |
| | | 79 | - if pkg-config xft; then |
| | | 80 | - OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS" |
| | | 81 | - LIBS="$LIBS `pkg-config --libs xft`" |
| | | 82 | - cat >>confdefs.h <<\_ACEOF |
| | | 83 | + if type pkg-config > /dev/null 2>&1 && pkg-config xft; then |
| | | 84 | + OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS" |
| | | 85 | + LIBS="$LIBS `pkg-config --libs xft`" |
| | | 86 | + cat >>confdefs.h <<\_ACEOF |
| | | 87 | #define USE_XFT2 1 |
| | | 88 | _ACEOF |
| | | 89 | |
| | | 90 | mgp_xft2_found="yes"; |
| | | 91 | - fi |
| | | 92 | fi |
| | | 93 | if test "$mgp_xft2_found" != "yes"; then |
| | | 94 | { echo "$as_me:$LINENO: checking for xft2 and ft2 and fc header.." >&5 |
| | | 95 | echo $ECHO_N "checking for xft2 and ft2 and fc header..... $ECHO_C" >&6; } |
| | | 96 | - for dir in /usr/include /usr/include/Xft2 /usr/X11R6/include \ |
| | | 97 | - /usr/X11R6/include/freetype2 \ |
| | | 98 | - /usr/local/include /usr/include/freetype2; do |
| | | 99 | + for dir in ${BUILDLINK_DIR}; do |
| | | 100 | if test -f $dir/X11/Xft/Xft.h; then |
| | | 101 | ac_cv_xft2_hdrdir="$dir" |
| | | 102 | fi |
| | | 103 | @@ -6984,7 +6970,7 @@ fi |
84 | echo 'FATAL: You need libungif to use gif images. pass proper LIBS to configure.' | | 104 | echo 'FATAL: You need libungif to use gif images. pass proper LIBS to configure.' |
85 | exit 1 | | 105 | exit 1 |
86 | fi | | 106 | fi |
87 | - for i in /usr/pkg /usr/local /usr; do | | 107 | - for i in /usr/pkg /usr/local /usr; do |
88 | + for i in ${BUILDLINK_DIR}; do | | 108 | + for i in ${BUILDLINK_DIR}; do |
89 | if test -f $i/include/gif_lib.h; then | | 109 | if test -f $i/include/gif_lib.h; then |
90 | gif_h_ok=yes | | 110 | gif_h_ok=yes |
91 | OPTFLAGS="$OPTFLAGS -I$i/include" | | 111 | OPTFLAGS="$OPTFLAGS -I$i/include" |
92 | @@ -5677,16 +5674,14 @@ | | 112 | @@ -7146,16 +7132,14 @@ fi |
93 | echo "$as_me:$LINENO: result: $mgp_imlib" >&5 | | 113 | { echo "$as_me:$LINENO: result: $mgp_imlib" >&5 |
94 | echo "${ECHO_T}$mgp_imlib" >&6 | | 114 | echo "${ECHO_T}$mgp_imlib" >&6; } |
95 | if test $mgp_imlib = "yes"; then | | 115 | if test $mgp_imlib = "yes"; then |
96 | - if type pkg-config > /dev/null 2>&1; then | | 116 | - if type pkg-config > /dev/null 2>&1; then |
97 | - if pkg-config imlib; then | | 117 | - if pkg-config imlib; then |
98 | - LIBS="$LIBS `pkg-config --libs imlib`" | | 118 | - LIBS="$LIBS `pkg-config --libs imlib`" |
99 | - OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`" | | 119 | - OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`" |
100 | - cat >>confdefs.h <<\_ACEOF | | 120 | - cat >>confdefs.h <<\_ACEOF |
101 | + if type pkg-config > /dev/null 2>&1 && pkg-config imlib; then | | 121 | + if type pkg-config > /dev/null 2>&1 && pkg-config imlib; then |
102 | + LIBS="$LIBS `pkg-config --libs imlib`" | | 122 | + LIBS="$LIBS `pkg-config --libs imlib`" |
103 | + OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`" | | 123 | + OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`" |
104 | + cat >>confdefs.h <<\_ACEOF | | 124 | + cat >>confdefs.h <<\_ACEOF |
105 | #define USE_IMLIB 1 | | 125 | #define USE_IMLIB 1 |
106 | _ACEOF | | 126 | _ACEOF |
107 | | | 127 | |
108 | USE_IMLIB=1 | | 128 | USE_IMLIB=1 |
109 | - fi | | 129 | - fi |
110 | else | | 130 | else |
111 | echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5 | | 131 | { echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5 |
112 | echo $ECHO_N "checking for Imlib_init in -lImlib... $ECHO_C" >&6 | | 132 | echo $ECHO_N "checking for Imlib_init in -lImlib... $ECHO_C" >&6; } |
113 | @@ -5757,7 +5752,7 @@ | | 133 | @@ -7232,7 +7216,7 @@ fi |
114 | echo 'FATAL: You need libImlib to use Imlib loading. pass proper LIBS to configure.' | | 134 | echo 'FATAL: You need libImlib to use Imlib loading. pass proper LIBS to configure.' |
115 | exit 1 | | 135 | exit 1 |
116 | fi | | 136 | fi |
117 | - for i in /usr/pkg /usr/local; do | | 137 | - for i in /usr/pkg /usr/local; do |
118 | + for i in ${BUILDLINK_DIR}; do | | 138 | + for i in ${BUILDLINK_DIR}; do |
119 | if test -f $i/include/Imlib.h; then | | 139 | if test -f $i/include/Imlib.h; then |
120 | imlib_h_ok=yes | | 140 | imlib_h_ok=yes |
121 | OPTFLAGS="$OPTFLAGS -I$i/include" | | 141 | OPTFLAGS="$OPTFLAGS -I$i/include" |
--- pkgsrc/graphics/magicpoint/patches/patch-ab 2004/04/27 15:42:58 1.3
+++ pkgsrc/graphics/magicpoint/patches/patch-ab 2008/09/10 13:32:47 1.4
| @@ -1,12 +1,53 @@ | | | @@ -1,12 +1,53 @@ |
1 | $NetBSD: patch-ab,v 1.3 2004/04/27 15:42:58 adam Exp $ | | 1 | $NetBSD: patch-ab,v 1.4 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- mgp.h.orig 2004-04-27 17:39:53.000000000 +0000 | | 3 | --- mgp.h.orig 2008-01-19 02:43:20.000000000 +0900 |
4 | +++ mgp.h | | 4 | +++ mgp.h |
5 | @@ -62,6 +62,7 @@ | | 5 | @@ -64,7 +64,9 @@ |
6 | #include <X11/cursorfont.h> | | | |
7 | #include <X11/Xatom.h> | | | |
8 | #ifdef USE_XFT2 | | 6 | #ifdef USE_XFT2 |
9 | +#include <ft2build.h> | | 7 | #include <ft2build.h> |
10 | #include <freetype/freetype.h> | | 8 | #include FT_FREETYPE_H |
11 | #include <fontconfig/fontconfig.h> | | 9 | -#include <fontconfig/fontconfig.h> |
| | | 10 | +#include FT_CONFIG_CONFIG_H |
| | | 11 | +#include <freetype2/freetype/fterrors.h> |
| | | 12 | +#include <freetype2/freetype/freetype.h> |
12 | #include <X11/Xft/Xft.h> | | 13 | #include <X11/Xft/Xft.h> |
| | | 14 | #ifdef HAVE_ICONV |
| | | 15 | #include <iconv.h> |
| | | 16 | @@ -308,6 +310,12 @@ struct ctrl_pcache { |
| | | 17 | struct ctrl { |
| | | 18 | u_char ct_op; |
| | | 19 | u_char ct_flag; |
| | | 20 | + enum { |
| | | 21 | + CTRL_DOUBLE, CTRL_INT, CTRL_INT2, CTRL_INT3, |
| | | 22 | + CTRL_LONG, CTRL_CHAR, CTRL_CHAR2, CTRL_IMAGE, |
| | | 23 | + CTRL_GRAD, CTRL_BAR, CTRL_ARGS, CTRL_ICON, |
| | | 24 | + CTRL_AREA, CTRL_PCACHE, CTRL_VOID |
| | | 25 | + } ct_type; |
| | | 26 | u_int ct_page; |
| | | 27 | struct ctrl *ct_next; |
| | | 28 | union { |
| | | 29 | @@ -745,6 +753,11 @@ extern int get_regid __P((char *)); |
| | | 30 | extern void draw_line_itemsize __P((struct render_state *, int, int, int)); |
| | | 31 | extern void draw_line_start __P((struct render_state *)); |
| | | 32 | extern void draw_line_end __P ((struct render_state *)); |
| | | 33 | +#ifdef USE_IMLIB |
| | | 34 | +int search_zimage(int, int, int); |
| | | 35 | +void zoomin_zimage(int); |
| | | 36 | +void zoomout_zimage(int); |
| | | 37 | +#endif |
| | | 38 | |
| | | 39 | #ifdef USE_M17N |
| | | 40 | extern int obj_new_mtext __P((struct render_state *, int, int, |
| | | 41 | @@ -843,6 +856,12 @@ extern void usleep __P((u_int)); |
| | | 42 | #define COLOR_BUGFIX |
| | | 43 | #endif |
| | | 44 | |
| | | 45 | +#ifdef MNG |
| | | 46 | +/*mng.c*/ |
| | | 47 | +void mngload(char *, int, int, int, int); |
| | | 48 | +void mngpreload(struct render_state *, char *, int *, int *); |
| | | 49 | +#endif |
| | | 50 | + |
| | | 51 | #ifdef USE_M17N |
| | | 52 | /*m17n.c*/ |
| | | 53 | extern void M17N_init __P((void)); |
--- pkgsrc/graphics/magicpoint/patches/patch-ac 2003/09/11 16:09:41 1.2
+++ pkgsrc/graphics/magicpoint/patches/patch-ac 2008/09/10 13:32:47 1.3
| @@ -1,15 +1,15 @@ | | | @@ -1,15 +1,15 @@ |
1 | $NetBSD: patch-ac,v 1.2 2003/09/11 16:09:41 jmmv Exp $ | | 1 | $NetBSD: patch-ac,v 1.3 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- Imakefile.in.orig 2001-02-03 19:46:49.000000000 +0100 | | 3 | --- Imakefile.in.orig 2007-12-03 18:08:40.000000000 +0900 |
4 | +++ Imakefile.in | | 4 | +++ Imakefile.in |
5 | @@ -22,8 +22,9 @@ LEX= @LEX@ | | 5 | @@ -22,8 +22,9 @@ LEX= @LEX@ |
6 | OPTFLAGS= @OPTFLAGS@ | | 6 | OPTFLAGS= @OPTFLAGS@ ${CPPFLAGS} |
7 | DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\" | | 7 | DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\" |
8 | #DEFS+= -DGLYPHEDGE | | 8 | #DEFS+= -DGLYPHEDGE |
9 | +DEPENDFLAGS= $(DEFS) $(OPTFLAGS) | | 9 | +DEPENDFLAGS= $(DEFS) $(OPTFLAGS) |
10 | | | 10 | |
11 | -SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LIBS@ | | 11 | -SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LIBS@ |
12 | +SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LDFLAGS@ @LIBS@ | | 12 | +SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LDFLAGS@ @LIBS@ |
13 | EXTRA_DEPLIBS= @DEPLIBS@ | | 13 | EXTRA_DEPLIBS= @DEPLIBS@ |
14 | | | 14 | |
15 | #undef DefaultCDebugFlags | | 15 | #undef DefaultCDebugFlags |
--- pkgsrc/graphics/magicpoint/patches/patch-ae 2005/04/07 23:11:57 1.2
+++ pkgsrc/graphics/magicpoint/patches/patch-ae 2008/09/10 13:32:47 1.3
| @@ -1,30 +1,28 @@ | | | @@ -1,30 +1,28 @@ |
1 | $NetBSD: patch-ae,v 1.2 2005/04/07 23:11:57 hira Exp $ | | 1 | $NetBSD: patch-ae,v 1.3 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- draw.c.orig 2003-05-14 16:45:35.000000000 +0900 | | 3 | --- draw.c.orig 2008-01-25 00:43:17.000000000 +0900 |
4 | +++ draw.c 2005-04-08 07:31:28.000000000 +0900 | | 4 | +++ draw.c |
5 | @@ -4498,12 +4498,12 @@ | | 5 | @@ -5243,7 +5243,7 @@ xft_draw_fragment(state, p, len, registr |
6 | struct ctrl *cp; | | | |
7 | char *fontname = NULL; | | | |
8 | int i; | | | |
9 | - static char etab[3][20] = { "iso2022jp", "gb2312", "ksc5601"}; | | | |
10 | + static char etab[3][20] = { "iso-2022-jp", "gb2312", "ksc5601"}; | | | |
11 | static char rtab[3][20] = { "jisx208", "gb2312", "ksc5601"}; | | | |
12 | static char prefix[3][20] = { "\033$B", "\033$A", "\033$(C"}; | | 6 | static char prefix[3][20] = { "\033$B", "\033$A", "\033$(C"}; |
13 | char buf16[1024], *p16; | | 7 | char buf16[1024], *p16; |
14 | char out16[1024], *o16; | | 8 | char out16[1024], *o16; |
15 | - int ileft, oleft; | | 9 | - int ileft, oleft; |
16 | + size_t ileft, oleft; | | 10 | + size_t ileft, oleft; |
17 | #ifdef HAVE_ICONV | | 11 | #ifdef HAVE_ICONV |
18 | static iconv_t icv[3]; | | 12 | static iconv_t icv[3]; |
19 | #endif | | 13 | #endif |
20 | @@ -4529,8 +4529,8 @@ | | 14 | @@ -5471,12 +5471,12 @@ xft_setfont(xfontarg, csize, registry) |
21 | } | | 15 | XFT_FAMILY, XftTypeString, font, |
22 | if (i == 3) return NULL; /* cannot find codeset */ | | 16 | XFT_ENCODING, XftTypeString, registry, |
23 | sprintf(buf16, "%s%s\0", prefix[i], p); | | 17 | XFT_STYLE, XftTypeString, style, |
24 | - if (!icv[i]) icv[i] = iconv_open("UTF8", etab[i]); | | 18 | - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0); |
25 | - if (icv[i] < 0){ | | 19 | + XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL); |
26 | + if (icv[i] == (iconv_t)0) icv[i] = iconv_open("UTF-8", etab[i]); | | 20 | } else { |
27 | + if (icv[i] == (iconv_t)-1){ | | 21 | xftfont = XftFontOpen(display, screen, |
28 | fprintf(stderr, "your iconv doesn't support %s\n", etab[i]); | | 22 | XFT_FAMILY, XftTypeString, font, |
29 | return NULL; | | 23 | XFT_ENCODING, XftTypeString, registry, |
30 | } | | 24 | - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0); |
| | | 25 | + XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL); |
| | | 26 | } |
| | | 27 | if (xftfont == 0) { |
| | | 28 | free(xfont); |
--- pkgsrc/graphics/magicpoint/patches/patch-ad 2004/01/12 15:19:28 1.1
+++ pkgsrc/graphics/magicpoint/patches/patch-ad 2008/09/10 13:32:47 1.2
| @@ -1,13 +1,26 @@ | | | @@ -1,13 +1,26 @@ |
1 | $NetBSD: patch-ad,v 1.1 2004/01/12 15:19:28 wennmach Exp $ | | 1 | $NetBSD: patch-ad,v 1.2 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- parse.c.orig 2003-11-24 21:49:38.000000000 +0900 | | 3 | --- parse.c.orig 2007-11-25 02:35:28.000000000 +0900 |
4 | +++ parse.c 2003-11-24 21:50:13.000000000 +0900 | | 4 | +++ parse.c |
5 | @@ -848,7 +848,7 @@ | | 5 | @@ -470,13 +470,14 @@ read_file(fp, filename, page, line, prea |
6 | tmpint[2]->cti_value = DEFAULT_VGAP; | | 6 | case CTL_TAB: |
7 | tmpint[3] = ctlalloc1(CTL_QUALITY); | | 7 | { |
8 | tmpint[3]->cti_value = DEFAULT_BQUALITY; | | 8 | int i = root->cti_value; |
9 | -#ifdef XFT2 | | 9 | - if (i < 0) { |
10 | +#ifdef USE_XFT2 | | 10 | - fprintf(stderr, "%s:%d: " |
11 | tmpint[4] = ctlalloc1(CTL_OPAQUE); | | 11 | - "invalid tab index %d\n", |
12 | tmpint[4]->cti_value = DEFAULT_OPAQUE; | | 12 | - filename, lineno, root->cti_value); |
13 | #endif | | 13 | - exit(-1); |
| | | 14 | - } |
| | | 15 | - if (i >= MAXTAB) { /*XXX*/ |
| | | 16 | + if (root->ct_type == CTRL_INT) { |
| | | 17 | + if (i < 0 || i >= MAXTAB ) { |
| | | 18 | + fprintf(stderr, "%s:%d: " |
| | | 19 | + "invalid tab index %d\n", |
| | | 20 | + filename, lineno, root->cti_value); |
| | | 21 | + exit(-1); |
| | | 22 | + } |
| | | 23 | + } else { |
| | | 24 | /* must be a string */ |
| | | 25 | /* find a free entry */ |
| | | 26 | for (i = MAXTAB ; i < MAXTAB + MAXSTYLE ; i++) { |
--- pkgsrc/graphics/magicpoint/patches/patch-af 2004/05/25 01:30:22 1.1
+++ pkgsrc/graphics/magicpoint/patches/patch-af 2008/09/10 13:32:47 1.2
| @@ -1,13 +1,28 @@ | | | @@ -1,13 +1,28 @@ |
1 | $NetBSD: patch-af,v 1.1 2004/05/25 01:30:22 danw Exp $ | | 1 | $NetBSD: patch-af,v 1.2 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- image/image.h.orig Mon May 24 21:09:56 2004 | | 3 | --- image/image.h.orig 2004-07-29 00:47:31.000000000 +0900 |
4 | +++ image/image.h | | 4 | +++ image/image.h |
5 | @@ -182,6 +182,8 @@ unsigned long doMemToValLSB(); | | 5 | @@ -10,6 +10,9 @@ |
| | | 6 | |
| | | 7 | #include "copyright.h" |
| | | 8 | #include <stdio.h> |
| | | 9 | +#ifdef HAVE_STDLIB_H |
| | | 10 | +#include <stdlib.h> |
| | | 11 | +#endif |
| | | 12 | |
| | | 13 | #if defined(SYSV) || defined(VMS) || 1 |
| | | 14 | #include <string.h> |
| | | 15 | @@ -182,13 +185,8 @@ unsigned long doMemToValLSB(); |
6 | unsigned long doValToMemLSB(); | | 16 | unsigned long doValToMemLSB(); |
7 | void flipBits(); | | 17 | void flipBits(); |
8 | | | 18 | |
9 | +#define zopen mgp_zopen | | 19 | -#ifdef __APPLE__ |
10 | + | | 20 | -/* darwin has zopen() */ |
11 | ZFILE *zopen(); | | 21 | ZFILE *zzopen(); /* zio.c */ |
| | | 22 | #define zopen zzopen |
| | | 23 | -#else |
| | | 24 | -ZFILE *zopen(); /* zio.c */ |
| | | 25 | -#endif |
12 | int zread(); | | 26 | int zread(); |
13 | void zreset(); | | 27 | int zgetc(); |
| | | 28 | char *zgets(); |
--- pkgsrc/graphics/magicpoint/patches/patch-ag 2004/05/25 01:30:22 1.1
+++ pkgsrc/graphics/magicpoint/patches/patch-ag 2008/09/10 13:32:47 1.2
| @@ -1,13 +1,16 @@ | | | @@ -1,13 +1,16 @@ |
1 | $NetBSD: patch-ag,v 1.1 2004/05/25 01:30:22 danw Exp $ | | 1 | $NetBSD: patch-ag,v 1.2 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- image/new.c.orig Mon Dec 28 03:23:13 1998 | | 3 | --- image/new.c.orig 2004-09-01 12:50:32.000000000 +0900 |
4 | +++ image/new.c | | 4 | +++ image/new.c |
5 | @@ -11,7 +11,7 @@ | | 5 | @@ -11,11 +11,7 @@ |
6 | #include "copyright.h" | | 6 | #include "copyright.h" |
7 | #include "image.h" | | 7 | #include "image.h" |
8 | | | 8 | |
| | | 9 | -#ifdef __APPLE__ |
| | | 10 | #include <stdlib.h> |
| | | 11 | -#else |
9 | -#include <malloc.h> | | 12 | -#include <malloc.h> |
10 | +#include <stdlib.h> | | 13 | -#endif |
11 | | | 14 | |
12 | extern int _Xdebug; | | 15 | extern int _Xdebug; |
13 | extern void memoryExhausted(void); | | 16 | extern void memoryExhausted(void); |
--- pkgsrc/graphics/magicpoint/patches/patch-al 2006/02/23 20:49:49 1.1
+++ pkgsrc/graphics/magicpoint/patches/patch-al 2008/09/10 13:32:47 1.2
| @@ -1,12 +1,12 @@ | | | @@ -1,12 +1,12 @@ |
1 | $NetBSD: patch-al,v 1.1 2006/02/23 20:49:49 joerg Exp $ | | 1 | $NetBSD: patch-al,v 1.2 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- image/imagetypes.c.orig 2006-02-23 20:28:04.000000000 +0000 | | 3 | --- image/imagetypes.c.orig 2001-01-18 18:07:14.000000000 +0900 |
4 | +++ image/imagetypes.c | | 4 | +++ image/imagetypes.c |
5 | @@ -50,7 +50,6 @@ static struct imagetypes { | | 5 | @@ -50,7 +50,6 @@ static struct imagetypes { |
6 | }; | | 6 | }; |
7 | /* SUPPRESS 560 */ | | 7 | /* SUPPRESS 560 */ |
8 | | | 8 | |
9 | -extern int errno; | | 9 | -extern int errno; |
10 | extern int findImage(char *, char *); | | 10 | extern int findImage(char *, char *); |
11 | | | 11 | |
12 | /* load a named image | | 12 | /* load a named image |
--- pkgsrc/graphics/magicpoint/patches/patch-am 2006/02/23 20:49:49 1.1
+++ pkgsrc/graphics/magicpoint/patches/patch-am 2008/09/10 13:32:47 1.2
| @@ -1,13 +1,13 @@ | | | @@ -1,13 +1,13 @@ |
1 | $NetBSD: patch-am,v 1.1 2006/02/23 20:49:49 joerg Exp $ | | 1 | $NetBSD: patch-am,v 1.2 2008/09/10 13:32:47 taca Exp $ |
2 | | | 2 | |
3 | --- image/path.c.orig 2006-02-23 20:30:55.000000000 +0000 | | 3 | --- image/path.c.orig 2004-07-29 00:47:31.000000000 +0900 |
4 | +++ image/path.c | | 4 | +++ image/path.c |
5 | @@ -24,8 +24,6 @@ | | 5 | @@ -27,8 +27,6 @@ |
6 | /* SUPPRESS 530 */ | | 6 | /* SUPPRESS 530 */ |
7 | /* SUPPRESS 560 */ | | 7 | /* SUPPRESS 560 */ |
8 | | | 8 | |
9 | -extern int errno; | | 9 | -extern int errno; |
10 | - | | 10 | - |
11 | /*static*/ unsigned int NumPaths= 0; | | 11 | /*static*/ unsigned int NumPaths= 0; |
12 | static unsigned int NumExts= 0; | | 12 | static unsigned int NumExts= 0; |
13 | /*static*/ char *Paths[BUFSIZ]; | | 13 | /*static*/ char *Paths[BUFSIZ]; |
$NetBSD: patch-an,v 1.1 2008/09/10 13:32:47 taca Exp $
--- ctlwords.c.orig 1999-02-15 08:02:25.000000000 +0900
+++ ctlwords.c
@@ -24,7 +24,10 @@ BEGIN {
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+int
main(int argc, char *argv[])
{
char buf[1024];
$NetBSD: patch-ao,v 1.1 2008/09/10 13:32:47 taca Exp $
--- grammar.y.orig 2008-01-19 02:43:20.000000000 +0900
+++ grammar.y
@@ -130,6 +130,7 @@ gen_void(op)
yyerror("cannot allocate void node");
return ct;
}
+ ct->ct_type = CTRL_VOID;
return ct;
}
@@ -145,6 +146,7 @@ gen_double_int(op, v)
return ct;
}
ct->ctf_value = (double)v;
+ ct->ct_type = CTRL_DOUBLE;
return ct;
}
@@ -160,6 +162,7 @@ gen_double(op, v)
return ct;
}
ct->ctf_value = v;
+ ct->ct_type = CTRL_DOUBLE;
return ct;
}
@@ -175,6 +178,7 @@ gen_int(op, v)
return ct;
}
ct->cti_value = v;
+ ct->ct_type = CTRL_INT;
return ct;
}
@@ -192,6 +196,7 @@ gen_int2(op, v1, v2)
}
ct->cti2_value1 = v1;
ct->cti2_value2 = v2;
+ ct->ct_type = CTRL_INT2;
return ct;
}
@@ -210,7 +215,8 @@ gen_int3(op, v1, v2, v3)
}
ct->cti3_value1 = v1;
ct->cti3_value2 = v2;
- ct->cti3_value3 = v3;
+ ct->cti3_value3 = v3;
+ ct->ct_type = CTRL_INT3;
return ct;
}
@@ -226,6 +232,7 @@ gen_str(op, str)
return ct;
}
ct->ctc_value = strdup(str);
+ ct->ct_type = CTRL_CHAR;
return ct;
}
@@ -243,6 +250,7 @@ gen_str2(op, str1, str2)
}
ct->ctc2_value1 = strdup(str1);
ct->ctc2_value2 = strdup(str2);
+ ct->ct_type = CTRL_CHAR2;
return ct;
}
@@ -259,6 +267,7 @@ gen_color(op, color)
}
if (get_color(color, &ct->ctl_value) < 0)
yyerror("cannot allocate color \"%s\"", color);
+ ct->ct_type = CTRL_LONG;
return ct;
}
@@ -284,6 +293,7 @@ gen_bgrad(w, h, colors, dir, zoomflg, ex
ct->ctd_numcolor = colors;
ct->ctd_dir = dir;
ct->ctd_zoomflag = zoomflg;
+ ct->ct_type = CTRL_GRAD;
/* process color list. */
siz = ct->ctd_g_colors = 0;
@@ -353,6 +363,7 @@ gen_newimage(arg)
}
/* default setting */
+ ct->ct_type = CTRL_IMAGE;
ct->ctm_ximagesize = 100;
ct->ctm_yimagesize = 100;
ct->ctm_zoomflag = Z_NORMAL | (Z_NORMAL << Z_YSHIFT);
@@ -463,6 +474,7 @@ gen_image(op, fname, colors, xsiz, ysiz,
yyerror("cannot allocate node (op=IMAGE)");
return ct;
}
+ ct->ct_type = CTRL_IMAGE;
ct->ctm_fname = embed_fname(fname);
ct->ctm_numcolor = colors;
ct->ctm_ximagesize = xsiz;
@@ -511,6 +523,7 @@ gen_bar(color, thick, start, len)
}
if (get_color(color, &ct->ctb_color) < 0)
yyerror("cannot allocate color %s", color);
+ ct->ct_type = CTRL_BAR;
ct->ctb_width = thick;
ct->ctb_start = start;
ct->ctb_length = len;
@@ -542,6 +555,7 @@ gen_icon(n, color, siz)
yyerror("cannot allocate node (op=ICON)");
return ct;
}
+ ct->ct_type = CTRL_ICON;
ct->ctic_value = n;
if (get_color(color, &ct->ctic_color) < 0)
yyerror("cannot allocate color %s", color);
@@ -562,6 +576,7 @@ gen_pcache(flag, mode, effect, value)
yyerror("cannot allocate node (op=PCACHE)");
return ct;
}
+ ct->ct_type = CTRL_PCACHE;
ct->ctch_flag = flag;
ct->ctch_mode = mode;
ct->ctch_effect = effect;
@@ -580,6 +595,7 @@ gen_valign(align)
yyerror("cannot allocate node (op=VALIGN)");
return ct;
}
+ ct->ct_type = CTRL_INT;
if (!strcmp(align, "center"))
ct->cti_value = VL_CENTER;
else {
@@ -629,6 +645,7 @@ gen_area(width, height, xoff, yoff)
ct->ctar_height = height;
ct->ctar_xoff = xoff;
ct->ctar_yoff = yoff;
+ ct->ct_type = CTRL_AREA;
return ct;
}
@@ -663,6 +680,7 @@ gen_argsfromnid(op, nid)
siz++;
}
ct->cta_argv[siz] = NULL;
+ ct->ct_type = CTRL_ARGS;
if (nid)
ctlfree(nid);
@@ -712,6 +730,7 @@ gen_argsfromstr(op, str, flag)
}
}
ct->cta_argv[ct->cta_argc] = NULL;
+ ct->ct_type = CTRL_ARGS;
return ct;
}
$NetBSD: patch-ap,v 1.1 2008/09/10 13:32:48 taca Exp $
--- contrib/xwintoppm/dsimple.h.orig 1998-02-13 16:48:30.000000000 +0900
+++ contrib/xwintoppm/dsimple.h
@@ -41,25 +41,25 @@ from the X Consortium.
/* Global variables used by routines in just_display.c */
-char *program_name = "unknown_program"; /* Name of this program */
-Display *dpy; /* The current display */
-int screen; /* The current screen */
+extern char *program_name;
+extern Display *dpy;
+extern int screen;
#define INIT_NAME program_name=argv[0] /* use this in main to setup
program_name */
/* Declaritions for functions in just_display.c */
-void Fatal_Error();
-char *Malloc();
-char *Realloc();
-char *Get_Display_Name();
-Display *Open_Display();
-void Setup_Display_And_Screen();
-XFontStruct *Open_Font();
-Pixmap ReadBitmapFile();
-void WriteBitmapFile();
-Window Select_Window_Args();
+void Fatal_Error(char *msg, ...);
+char *Malloc(unsigned int);
+char *Realloc(char *, int);
+char *Get_Display_Name(int *, char **);
+Display *Open_Display(char *);
+void Setup_Display_And_Screen(int *, char **);
+XFontStruct *Open_Font(char *);
+Pixmap ReadBitmapFile(Drawable, char *, int*, int*, int*, int*);
+void WriteBitmapFile(char *, Pixmap, int, int, int, int);
+Window Select_Window_Args(int *, char **);
#define X_USAGE "[host:display]" /* X arguments handled by
Get_Display_Name */
@@ -73,9 +73,10 @@ Window Select_Window_Args();
* Send bugs, etc. to chariot@athena.mit.edu.
*/
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-void out();
-void blip();
-Window Window_With_Name();
+unsigned long Resolve_Color(Window, char *);
+Pixmap Bitmap_To_Pixmap(Display *, Drawable, GC, Pixmap, int, int);
+Window Select_Window(Display *);
+void blip(void);
+Window Window_With_Name(Display *, Window, char *);
+void outl(char *, ...);
+void usage(void);
$NetBSD: patch-aq,v 1.1 2008/09/10 13:32:48 taca Exp $
--- 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 <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <stdio.h>
+#include <stdarg.h>
+
/*
* Other_stuff.h: Definitions of routines in other_stuff.
*
@@ -47,14 +49,9 @@ char *malloc(), realloc();
#include <stdlib.h>
#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);
}
$NetBSD: patch-ar,v 1.1 2008/09/10 13:32:48 taca Exp $
--- contrib/xwintoppm/xwintoppm.c.orig 1998-08-26 14:30:16.000000000 +0900
+++ contrib/xwintoppm/xwintoppm.c
@@ -136,8 +136,10 @@ Bool silent = False;
Bool use_installed = False;
long add_pixel_value = 0;
-extern int (*_XErrorFunction)();
-extern int _XDefaultError();
+void Error(char *);
+void Window_Dump(Window, FILE *);
+int Image_Size(XImage *);
+int Get_XColors(XWindowAttributes *, XColor **);
static long parse_long (s)
char *s;
@@ -155,11 +157,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;
@@ -280,7 +283,7 @@ XColor **colors ;
* Window_Dump: dump a window to a file which must already be open for
* writting.
*/
-
+void
Window_Dump(window, out)
Window window;
FILE *out;
@@ -609,6 +612,7 @@ Window_Dump(window, out)
/*
* Report the syntax for calling xwd.
*/
+void
usage()
{
fprintf (stderr,
@@ -622,7 +626,7 @@ usage()
/*
* Error - Fatal xwd error.
*/
-
+void
Error(string)
char *string; /* Error description string. */
{
@@ -716,6 +720,7 @@ int Get_XColors(win_info, colors)
return ncolors ;
}
+void
_swapshort (bp, n)
register char *bp;
register unsigned n;
@@ -731,6 +736,7 @@ _swapshort (bp, n)
}
}
+void
_swaplong (bp, n)
register char *bp;
register unsigned n;
$NetBSD: patch-as,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/bright.c.orig 1998-12-28 17:22:53.000000000 +0900
+++ image/bright.c
@@ -248,6 +248,7 @@ Image *normalize(image, verbose)
void gray(image, verbose)
Image *image;
+ int verbose;
{ int a;
unsigned int size;
Intensity intensity, red, green, blue;
$NetBSD: patch-at,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/faces.c.orig 2001-08-31 02:10:30.000000000 +0900
+++ image/faces.c
@@ -86,6 +86,7 @@ static int nextInt(zf, len)
Image *facesLoad(fullname, name, verbose)
char *fullname, *name;
+ int verbose;
{ ZFILE *zf;
Image *image;
char fname[BUFSIZ];
$NetBSD: patch-au,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/rlelib.c.orig 2007-05-18 01:47:33.000000000 +0900
+++ image/rlelib.c
@@ -428,6 +428,7 @@ register struct sv_globals * globals;
*/
void
RunSkipBlankLines(nblank, globals)
+int nblank;
register struct sv_globals * globals;
{
}
@@ -439,6 +440,7 @@ register struct sv_globals * globals;
*/
void
RunSetColor(c, globals)
+int c;
register struct sv_globals * globals;
{
}
@@ -451,6 +453,7 @@ register struct sv_globals * globals;
/* ARGSUSED */
void
RunSkipPixels(nskip, last, wasrun, globals)
+int nskip, last, wasrun;
register struct sv_globals * globals;
{
}
@@ -462,6 +465,7 @@ register struct sv_globals * globals;
*/
void
RunNewScanLine(flag, globals)
+int flag;
register struct sv_globals * globals;
{
}
@@ -473,6 +477,7 @@ register struct sv_globals * globals;
void
Runputdata(buf, n, globals)
rle_pixel * buf;
+int n;
register struct sv_globals * globals;
{
}
@@ -485,6 +490,7 @@ register struct sv_globals * globals;
/* ARGSUSED */
void
Runputrun(color, n, last, globals)
+int color, n, last;
register struct sv_globals * globals;
{
}
@@ -1391,6 +1397,7 @@ int dith_size = 16;
*/
void
dithermap(levels, gamma, rgbmap, divN, modN, magic)
+int levels;
double gamma;
int rgbmap[][3];
int divN[256];
@@ -1451,6 +1458,7 @@ int magic[16][16];
*/
void
bwdithermap(levels, gamma, bwmap, divN, modN, magic)
+int levels;
double gamma;
int bwmap[];
int divN[256];
@@ -1677,6 +1685,7 @@ int gammamap[256];
*/
int
dithergb(x, y, r, g, b, levels, divN, modN, magic)
+int x, y, r, g, b, levels;
int divN[256];
int modN[256];
int magic[16][16];
@@ -1708,6 +1717,7 @@ int magic[16][16];
*/
int
ditherbw(x, y, val, divN, modN, magic)
+int x, y, val;
int divN[256];
int modN[256];
int magic[16][16];
$NetBSD: patch-av,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/rotate.c.orig 2003-08-23 15:22:09.000000000 +0900
+++ image/rotate.c
@@ -40,6 +40,7 @@ int *new_pos; /* Destination bit posi
Image *rotate(simage, degrees, verbose)
Image *simage; /* Image to rotate */
int degrees; /* Number of degrees to rotate */
+int verbose;
{
char buf[BUFSIZ]; /* New title */
Image *image1; /* Source image */
$NetBSD: patch-aw,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/smooth.c.orig 1998-02-13 16:49:04.000000000 +0900
+++ image/smooth.c
@@ -74,6 +74,7 @@ static Image *doSmooth(image)
Image *smooth(image, iterations, verbose)
Image *image;
+ int iterations;
int verbose;
{ int a;
Image *old, *new;
$NetBSD: patch-ax,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/window.c.orig 2004-07-29 00:47:31.000000000 +0900
+++ image/window.c
@@ -16,7 +16,7 @@
#include <signal.h>
#include <errno.h>
#include <sys/types.h>
-#ifdef SYSV
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if TIME_WITH_SYS_TIME
@@ -224,7 +224,7 @@ void setViewportColormap(disp, scrn, vis
int scrn;
Visual *visual;
{ XSetWindowAttributes swa;
- static cmap_atom= None;
+ static int cmap_atom= None;
Window cmap_windows[2];
if (cmap_atom == None)
$NetBSD: patch-ay,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/zio.c.orig 2004-07-29 00:47:31.000000000 +0900
+++ image/zio.c
@@ -134,11 +134,7 @@ void zreset(filename)
}
}
-#ifdef __APPLE__
ZFILE *zzopen(name)
-#else
-ZFILE *zopen(name)
-#endif
char *name;
{ int a;
ZFILE *zf;
$NetBSD: patch-az,v 1.1 2008/09/10 13:32:48 taca Exp $
--- image/zoom.c.orig 2003-08-23 15:22:09.000000000 +0900
+++ image/zoom.c
@@ -39,6 +39,7 @@ static unsigned int *buildIndex(width, z
Image *zoom(oimage, xzoom, yzoom, verbose)
Image *oimage;
float xzoom, yzoom;
+ int verbose;
{ char buf[BUFSIZ];
Image *image=NULL;
unsigned int *xindex, *yindex;
$NetBSD: patch-ba,v 1.1 2008/09/10 13:32:48 taca Exp $
--- sample/default.mgp.orig 2001-08-11 01:40:54.000000000 +0900
+++ sample/default.mgp
@@ -1,20 +1,24 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This default.mgp is "TrueType fonts" oriented.
-%% First, you should create "~/.mgprc" whose contents are:
-%% tfdir "/path/to/truetype/fonts"
-%%
-%% To visualize English, install "standard.ttf", "thick.ttf", and
-%% "typewriter.ttf" into the "tfdir" directory above:
-%% ftp://ftp.mew.org/pub/mgp/ttf-us.tar.gz
-%%
-%% To visualize Japanese, install "kochi-mincho.ttf" and "goth.ttf"
-%% 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"
+%% Default font settings for xft2.
+%%
+%@MGP_XFONT@deffont "standard" xfont "serif" "iso8859-1", xfont "serif" "jisx0208.1983"
+%@MGP_XFONT@deffont "thick" xfont "sans-serif" "iso8859-1", xfont "sans-serif" "jisx0208.1983"
+%% %ddeffont "typewriter" xfont "sans-serif" "iso8859-1", xfont "sans-serif" "jisx0208.1983"
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Default font settings for vflib.
+%%
+%@MGP_VFONT@deffont "standard" vfont "min"
+%@MGP_VFONT@deffont "thick" vfont "goth"
+%@MGP_VFONT@deffont "typewriter" vfont "goth"
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Default font settings for freetype.
+%%
+%@MGP_TFONT@deffont "standard" tfont "standard.ttf", tmfont "kochi-mincho.ttf"
+%@MGP_TFONT@deffont "thick" tfont "thick.ttf", tmfont "goth.ttf"
+%@MGP_TFONT@deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% Default settings per each line numbers.
$NetBSD: patch-bb,v 1.1 2008/09/10 13:32:48 taca Exp $
--- x11.c.orig 2008-01-25 00:43:17.000000000 +0900
+++ x11.c
@@ -355,7 +355,7 @@ init_win3()
void
toggle_fullscreen()
{
- static fullscreen = 0;
+ static int fullscreen = 0;
XClientMessageEvent xev;
fullscreen = ++fullscreen % 2;