pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/magicpoint Update magicpoint to 1.13a.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d4d5e03b4312
branches: trunk
changeset: 546960:d4d5e03b4312
user: taca <taca%pkgsrc.org@localhost>
date: Wed Sep 10 13:32:47 2008 +0000
description:
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
diffstat:
graphics/magicpoint/Makefile | 71 ++++++--------
graphics/magicpoint/PLIST | 4 +-
graphics/magicpoint/distinfo | 43 ++++++---
graphics/magicpoint/options.mk | 48 ++++++++++
graphics/magicpoint/patches/patch-aa | 158 +++++++++++++++++++---------------
graphics/magicpoint/patches/patch-ab | 57 ++++++++++-
graphics/magicpoint/patches/patch-ac | 6 +-
graphics/magicpoint/patches/patch-ad | 37 +++++--
graphics/magicpoint/patches/patch-ae | 40 ++++----
graphics/magicpoint/patches/patch-af | 29 ++++-
graphics/magicpoint/patches/patch-ag | 11 +-
graphics/magicpoint/patches/patch-ah | 41 ---------
graphics/magicpoint/patches/patch-ak | 13 --
graphics/magicpoint/patches/patch-al | 4 +-
graphics/magicpoint/patches/patch-am | 6 +-
graphics/magicpoint/patches/patch-an | 15 +++
graphics/magicpoint/patches/patch-ao | 158 +++++++++++++++++++++++++++++++++++
graphics/magicpoint/patches/patch-ap | 60 +++++++++++++
graphics/magicpoint/patches/patch-aq | 101 ++++++++++++++++++++++
graphics/magicpoint/patches/patch-ar | 73 ++++++++++++++++
graphics/magicpoint/patches/patch-as | 12 ++
graphics/magicpoint/patches/patch-at | 12 ++
graphics/magicpoint/patches/patch-au | 84 ++++++++++++++++++
graphics/magicpoint/patches/patch-av | 12 ++
graphics/magicpoint/patches/patch-aw | 12 ++
graphics/magicpoint/patches/patch-ax | 22 ++++
graphics/magicpoint/patches/patch-ay | 16 +++
graphics/magicpoint/patches/patch-az | 12 ++
graphics/magicpoint/patches/patch-ba | 44 +++++++++
graphics/magicpoint/patches/patch-bb | 13 ++
30 files changed, 975 insertions(+), 239 deletions(-)
diffs (truncated from 1461 to 300 lines):
diff -r 91afba926f54 -r d4d5e03b4312 graphics/magicpoint/Makefile
--- a/graphics/magicpoint/Makefile Wed Sep 10 13:05:11 2008 +0000
+++ b/graphics/magicpoint/Makefile Wed Sep 10 13:32:47 2008 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2008/05/24 13:53:33 tnn Exp $
+# $NetBSD: Makefile,v 1.62 2008/09/10 13:32:47 taca Exp $
-DISTNAME= magicpoint-1.10a
-PKGREVISION= 11
-#DISTNAME= magicpoint-1.11b.tar.gz
+DISTNAME= magicpoint-1.13a
CATEGORIES= x11 graphics
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
@@ -18,21 +16,27 @@
USE_TOOLS+= perl
USE_TOOLS+= pkg-config
-PKG_OPTIONS_VAR= PKG_OPTIONS.magicpoint
-PKG_SUPPORTED_OPTIONS= freetype vflib xft2
-PKG_SUGGESTED_OPTIONS= xft2
-
-.include "../../mk/bsd.options.mk"
-
CONFIGURE_ARGS+= --enable-freetype-charset16
CONFIGURE_ARGS+= --enable-locale
CONFIGURE_ARGS+= --enable-gif
+CONFIGURE_ARGS+= --with-searchpath=${BUILDLINK_DIR:Q}
CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
CONFIGURE_ENV+= mgp_cv_path_perl=${TOOLS_PERL5:Q}
-MGP_RENDERING_ENGINES= freetype graphics/freetype-lib \
- xft2 x11/libXft \
- vflib print/ja-vflib-lib
+DOCDIR= share/doc/mgp
+EGDIR= share/examples/mgp
+INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
+
+DOCS= COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \
+ README.fonts.jp README.lang SYNTAX USAGE USAGE.jp
+EXAMPLES= README README.jp cloud.jpg dad.eps dad.jpg \
+ default.mgp embed-jp.mgp embed.mgp gradation-jp.mgp \
+ gradation.mgp m17n-lib.mgp mgp-old1.jpg mgp-old2.jpg \
+ mgp-old3.jpg mgp1.jpg mgp2.jpg mgp3.jpg mgp3.xbm \
+ mgprc-sample multilingual.mgp sample-fr.mgp \
+ sample-jp-xft.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
# We need to perform the steps normally done by ``xmkmf -a'' since some
# files need to be created before ``make depend''.
@@ -42,42 +46,29 @@
MGP_PRE_STAGE= ctlwords.h grammar.c scanner.c tokdefs.h \
Makefiles includes depend
+.include "options.mk"
+
+SUBST_CLASSES+= conf
+SUBST_FILES.conf+= sample/default.mgp
+SUBST_SED.conf+= -e 's|@MGP_TFONT@|${MGP_TFONT}|g'
+SUBST_SED.conf+= -e 's|@MGP_VFONT@|${MGP_VFONT}|g'
+SUBST_SED.conf+= -e 's|@MGP_XFONT@|${MGP_XFONT}|g'
+SUBST_STAGE.conf= post-configure
+
post-configure:
.for s in ${MGP_PRE_STAGE}
cd ${WRKSRC}; \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${s}
.endfor
-pre-install:
- ${SED} -e "/^%% Default.*${PKG_OPTIONS}\./,/^%%%/s/^%% %/%/" \
- ${WRKSRC}/sample/default.mgp.template > \
- ${WRKSRC}/sample/default.mgp
-
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgp
- cd ${WRKSRC}; \
- for f in COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \
- README.fonts.jp README.lang SYNTAX USAGE USAGE.jp; do \
- ${INSTALL_DATA} $$f ${PREFIX}/share/doc/mgp; \
- done
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mgp
- cd ${WRKSRC}/sample; \
- for f in README* *.jpg *.eps *.mgp *.xbm mgprc-sample; do \
- ${INSTALL_DATA} $$f ${PREFIX}/share/examples/mgp; \
- done
-
-.for engine pkg in ${MGP_RENDERING_ENGINES}
-. if !empty(PKG_OPTIONS:M${engine})
-CONFIGURE_ARGS+= --enable-${engine}
-.include "../../${pkg}/buildlink3.mk"
-. else
-CONFIGURE_ARGS+= --disable-${engine}
-. endif
+.for f in ${DOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
+.endfor
+.for f in ${EXAMPLES}
+ ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${DESTDIR}${PREFIX}/${EGDIR}
.endfor
-.if !empty(PKG_OPTIONS:Mxft2)
-.include "../../graphics/freetype2/buildlink3.mk"
-.endif
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/netpbm/buildlink3.mk"
diff -r 91afba926f54 -r d4d5e03b4312 graphics/magicpoint/PLIST
--- a/graphics/magicpoint/PLIST Wed Sep 10 13:05:11 2008 +0000
+++ b/graphics/magicpoint/PLIST Wed Sep 10 13:32:47 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/02 19:47:23 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/09/10 13:32:47 taca Exp $
bin/mgp
bin/mgp2ps
bin/mgpembed
@@ -33,6 +33,7 @@
share/examples/mgp/embed.mgp
share/examples/mgp/gradation-jp.mgp
share/examples/mgp/gradation.mgp
+share/examples/mgp/m17n-lib.mgp
share/examples/mgp/mgp-old1.jpg
share/examples/mgp/mgp-old2.jpg
share/examples/mgp/mgp-old3.jpg
@@ -44,6 +45,7 @@
share/examples/mgp/multilingual.mgp
share/examples/mgp/sample-fr.mgp
share/examples/mgp/sample-jp.mgp
+share/examples/mgp/sample-jp-xft.mgp
share/examples/mgp/sample.mgp
share/examples/mgp/sendmail6-jp.mgp
share/examples/mgp/sendmail6.mgp
diff -r 91afba926f54 -r d4d5e03b4312 graphics/magicpoint/distinfo
--- a/graphics/magicpoint/distinfo Wed Sep 10 13:05:11 2008 +0000
+++ b/graphics/magicpoint/distinfo Wed Sep 10 13:32:47 2008 +0000
@@ -1,18 +1,31 @@
-$NetBSD: distinfo,v 1.15 2006/02/23 20:49:49 joerg Exp $
+$NetBSD: distinfo,v 1.16 2008/09/10 13:32:47 taca Exp $
-SHA1 (magicpoint-1.10a.tar.gz) = 7510ee965316cb52eac7a430f0e19a87a337fe5c
-RMD160 (magicpoint-1.10a.tar.gz) = 167bf8b57bd4bb98c8f4fdba82a5733dda1f8a6a
-Size (magicpoint-1.10a.tar.gz) = 843657 bytes
-SHA1 (patch-aa) = f4d97279e878a58900ceff5ea07c61ca678e61f5
-SHA1 (patch-ab) = 0553e8369f3337e53ecd8a8926ceeed9757953b8
-SHA1 (patch-ac) = 1b2de41c2a8da28c9023552eff676c40069630fe
-SHA1 (patch-ad) = d6dd11bee4091de4f1c8d5fffa61987d16a063e1
-SHA1 (patch-ae) = c293c8f9c406fe8f090378b328b6bdbe89050eee
-SHA1 (patch-af) = b52455c3018d5de4ee7d20c42680df8978f15b55
-SHA1 (patch-ag) = 02e53e3e498b150d528349c9712978f164e8836f
-SHA1 (patch-ah) = 2cd87d9697be2ebd9d7c0a936d49583286de62d3
+SHA1 (magicpoint-1.13a.tar.gz) = 2bc662ad0a482d42578766258a143b06a4718ae3
+RMD160 (magicpoint-1.13a.tar.gz) = 067d7dee3b90ec354975d9ad4ea0c0df48cca191
+Size (magicpoint-1.13a.tar.gz) = 890670 bytes
+SHA1 (patch-aa) = 7270255c2002c66d10ab911ed22ce67067183e17
+SHA1 (patch-ab) = eb6558d6981e5d5f41f55dddc1b3debc9ca27d36
+SHA1 (patch-ac) = 9442e1893475ff53180f7facce0f31bf2e412759
+SHA1 (patch-ad) = 33c8fa61cb03cb53ad8783d2d79fa457cb21d235
+SHA1 (patch-ae) = ca59b94955f2de6f19ea1e2210ede7eaeba50a95
+SHA1 (patch-af) = 615e845dfbeba9b35c5a138841962631dac3b4bb
+SHA1 (patch-ag) = 96d7cac9157b9183dd2ba76b12f0927fc15dd5a6
SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b
SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004
-SHA1 (patch-ak) = bb1364f9fec905e09eb7453a4bc0a8cab557b3b3
-SHA1 (patch-al) = a0956fc353d38f937d3829fa0e6cd70c9cb60faa
-SHA1 (patch-am) = ba255a9e749f627d777cebbd29521b8c368d69dc
+SHA1 (patch-al) = 25faf28b240d90ead9a4283e46d1461118c509df
+SHA1 (patch-am) = dcc58a02946353262a78d5dfd81f81b25990019e
+SHA1 (patch-an) = f5e3158b972feb20bf464e57c703e871537d074e
+SHA1 (patch-ao) = 64ba2d7ceaf6429f4bb8b88bebb26a83c12fbacd
+SHA1 (patch-ap) = 6c81429affe9dce518c304178dd6dfe571e5e44c
+SHA1 (patch-aq) = 1c67df7538626e9a497e702e246291155417892a
+SHA1 (patch-ar) = 8279fba385c3013626aa74401201e37246c9cc82
+SHA1 (patch-as) = 05a1f6ab546127a94a34fd371c455461a46ffdd7
+SHA1 (patch-at) = 61a70481cbc370589f695109d9a593c97644617b
+SHA1 (patch-au) = 9c15ef5fa369d4513a46192eeea1b7c4a73bce8e
+SHA1 (patch-av) = 05d19e06a2f1341da063da537d46232e99fae35d
+SHA1 (patch-aw) = 44e83a46c170b632ec576995fc6a0b752a4caf42
+SHA1 (patch-ax) = 130159e6b03f5d6acf39de108c91dbb87302832a
+SHA1 (patch-ay) = 4c618b7c51f8b41a472ddd6cba938a2ccb3d91e1
+SHA1 (patch-az) = 893ec7e21199205c07933d5525a6eb394114fd11
+SHA1 (patch-ba) = 938e5714ddfcb8ca64d1cc6f756eeb69e592905d
+SHA1 (patch-bb) = 3a6c328adcb49aef0d4792ceff08407fcbc80c16
diff -r 91afba926f54 -r d4d5e03b4312 graphics/magicpoint/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/magicpoint/options.mk Wed Sep 10 13:32:47 2008 +0000
@@ -0,0 +1,48 @@
+# $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?= % %
diff -r 91afba926f54 -r d4d5e03b4312 graphics/magicpoint/patches/patch-aa
--- a/graphics/magicpoint/patches/patch-aa Wed Sep 10 13:05:11 2008 +0000
+++ b/graphics/magicpoint/patches/patch-aa Wed Sep 10 13:32:47 2008 +0000
@@ -1,19 +1,79 @@
-$NetBSD: patch-aa,v 1.10 2004/01/12 15:19:28 wennmach Exp $
+$NetBSD: patch-aa,v 1.11 2008/09/10 13:32:47 taca Exp $
---- configure.orig 2003-05-28 14:34:23.000000000 +0900
-+++ configure 2004-01-11 04:18:35.000000000 +0900
-@@ -4108,7 +4108,7 @@
+--- configure.orig 2007-12-29 05:31:26.000000000 +0900
++++ configure
+@@ -5090,7 +5090,7 @@ if test "$mgp_use_freetype" = "yes"; the
# XXX: freetype2 may use freetype-config
- echo "$as_me:$LINENO: checking for freetype1 library/header" >&5
- echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6
-- for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 ; do
+ { echo "$as_me:$LINENO: checking for freetype1 library/header" >&5
+ echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6; }
+- for dir in $SEARCHPATH /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 /sw; do
+ for dir in ${BUILDLINK_DIR}; do
ac_cv_ft_lib=no
ac_cv_ft_include=no
- shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'`
-@@ -4379,15 +4379,13 @@
- echo "$as_me:$LINENO: result: $mgp_use_xft2" >&5
- echo "${ECHO_T}$mgp_use_xft2" >&6
+ shlib=`echo $dir/lib/libttf.$SHLIBEXT* | head -n 1 | sed -e 's/.*\///'`
+@@ -5384,7 +5384,7 @@ echo "${ECHO_T}$mgp_use_vflib" >&6; }
+ if test "$mgp_use_vflib" = "yes"; then
+ { echo "$as_me:$LINENO: checking for VFlib library/header" >&5
+ echo $ECHO_N "checking for VFlib library/header... $ECHO_C" >&6; }
+- for dir in $SEARCHPATH /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr; do
++ for dir in ${BUILDLINK_DIR}; do
+ ac_cv_vf_libname=VFlib
+ ac_cv_vf_libdir=no
+ ac_cv_vf_hdrdir=no
+@@ -5562,12 +5562,7 @@ fi
+ if test -f "$with_vfontcap"; then
+ ac_cv_vf_fontcap=$with_vfontcap;
+ else
+- for ac_dir in /usr/local/lib /usr/local/lib/tex \
+- /usr/local/lib/VFlib /usr/local/lib/fonts/vf \
+- /usr/local/lib /usr/local/etc /etc \
+- /usr/local/libdata/vflib /usr/local/share/VFlib \
+- /usr/local/share/VFlib/* \
+- ../../VFlib* ../VFlib* VFlib*; do
++ for ac_dir in ${prefix}/share/VFlib/*; do
+ if test -d $ac_dir -a -f $ac_dir/vfontcap; then
+ ac_cv_vf_fontcap=$ac_dir/vfontcap;
+ break
+@@ -5609,22 +5604,17 @@ _ACEOF
+ fi
+ fi
+
+-if type pkg-config > /dev/null 2>&1; then
+- for pnglib in libpng libpng12 libpng10
+- do
+- if pkg-config $pnglib; then
+- LIBS="$LIBS `pkg-config --libs $pnglib`"
+- OPTFLAGS="$OPTFLAGS `pkg-config --cflags $pnglib`"
+- cat >>confdefs.h <<\_ACEOF
++if type pkg-config > /dev/null 2>&1 && pkg-config libpng; then
++ LIBS="$LIBS `pkg-config --libs libpng`"
++ OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`"
Home |
Main Index |
Thread Index |
Old Index