diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | japanese/Makefile | 1 | ||||
| -rw-r--r-- | japanese/magicpoint/Makefile | 18 | ||||
| -rw-r--r-- | misc/magicpoint/Makefile | 63 | ||||
| -rw-r--r-- | misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in | 25 | ||||
| -rw-r--r-- | misc/magicpoint/files/patch-image-rlelib.c | 11 | ||||
| -rw-r--r-- | misc/magicpoint/files/patch-sample::default.mgp | 15 | ||||
| -rw-r--r-- | misc/magicpoint/pkg-plist | 58 |
8 files changed, 78 insertions, 114 deletions
@@ -3661,3 +3661,4 @@ japanese/jvim3-wnn6|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3 japanese/jvim3-wnn7|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3 security/libfwbuilder2|security/libfwbuilder|2008-11-05|replaced by libfwbuilder 3.0 security/fwbuilder2|security/fwbuilder|2008-11-05|replaced by fwbuilder 3.0 +japanese/magicpoint|misc/magicpoint|2008-11-07|Integrated into misc/magicpoint diff --git a/japanese/Makefile b/japanese/Makefile index e3406d076bc3..ff8a7ac87fd9 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -150,7 +150,6 @@ SUBDIR += lsd-fpw SUBDIR += lynx SUBDIR += lynx-current - SUBDIR += magicpoint SUBDIR += mailman SUBDIR += makejvf SUBDIR += man diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile deleted file mode 100644 index bb1253b55fb4..000000000000 --- a/japanese/magicpoint/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# New ports collection makefile for: magicpoint (with vflib) -# Date created: 25 Dec 1997 -# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org> -# -# $FreeBSD$ -# - -MASTERDIR= ${.CURDIR}/../../misc/magicpoint -COMMENT= An X11-based presentation tool, configured with vflib support - -PORTREVISION= 1 -CATEGORIES= japanese - -MAINTAINER= mita@jp.FreeBSD.org - -WITH_JAPANESE=yes - -.include "${MASTERDIR}/Makefile" diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 822b79f72f1b..15a5abafb05e 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -4,15 +4,15 @@ # # $FreeBSD$ # -# "?=" and "+=" are for localized (i.e. Japanese) version PORTNAME= magicpoint PORTVERSION= 1.13a +PORTREVISION= 1 CATEGORIES?= misc MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ -MAINTAINER?= dinoex@FreeBSD.org -COMMENT?= An X11-based presentation tool +MAINTAINER= dinoex@FreeBSD.org +COMMENT= An X11-based presentation tool LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ mng:${PORTSDIR}/graphics/libmng @@ -20,6 +20,7 @@ RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm USE_IMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-vflib OPTIONS+= FREETYPE "With FreeType support" on \ XFT "With Xft2 support" on \ @@ -28,7 +29,7 @@ OPTIONS+= FREETYPE "With FreeType support" on \ MAN1= mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1 -DOCSDIR= ${PREFIX}/share/doc/mgp +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 \ @@ -38,15 +39,16 @@ SAMPLES= README README.jp cloud.jpg dad.eps dad.jpg default.mgp \ 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 mgp-el/COPYING mgp-el/README \ - mgp-el/mgp.el mgp-el/mgp.sty mgp-el/sample.tex +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 .include <bsd.port.pre.mk> .if defined(WITH_FREETYPE) USE_FREETYPE= yes -CONFIGURE_ARGS+= --enable-freetype +CONFIGURE_ARGS+= --enable-freetype \ + --enable-freetype-charset16 .else CONFIGURE_ARGS+= --disable-freetype .endif @@ -72,46 +74,33 @@ CONFIGURE_ARGS+= --enable-imlib CONFIGURE_ARGS+= --disable-imlib .endif -.if defined(WITH_JAPANESE) -LIB_DEPENDS+= VFlib2.24:${PORTSDIR}/japanese/vflib -CONFIGURE_ARGS+= --enable-vflib \ - --with-vfontcap=`${LS} -1 ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1` \ - --enable-freetype-charset16 -.else -CONFIGURE_ARGS+= --disable-vflib -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|varargs.h|stdarg.h|' \ - ${WRKSRC}/image/rlelib.c - post-configure: - (cd ${WRKSRC}/contrib/xmindpath; ./configure --prefix=${PREFIX}) + cd ${WRKSRC}/contrib/xmindpath && \ + ${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX} post-build: - (cd ${WRKSRC}/contrib/xmindpath; make) + cd ${WRKSRC}/contrib/xmindpath && \ + ${MAKE} -# NOTE: there are some discussions/twists in gzip'ing xmindpath.1. post-install: - (cd ${WRKSRC}/contrib/xmindpath; make install) - ${GZIP_CMD} ${PREFIX}/man/man1/xmindpath.1 + cd ${WRKSRC}/contrib/xmindpath && \ + ${MAKE} ${INSTALL_TARGET} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - for i in ${DOCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR}; \ - done + cd ${WRKSRC} && \ + ${INSTALL_DATA} ${DOCS} ${DOCSDIR} ${MKDIR} ${DOCSDIR}/sample - for i in ${SAMPLES}; do \ - ${INSTALL_DATA} ${WRKSRC}/sample/$$i ${DOCSDIR}/sample; \ - done + cd ${WRKSRC}/sample && \ + ${INSTALL_DATA} ${SAMPLES} ${DOCSDIR}/sample/ + ${MKDIR} ${DOCSDIR}/emacs-lisp + cd ${WRKSRC}/contrib && \ + ${INSTALL_DATA} ${EMACS_LISPS} ${DOCSDIR}/emacs-lisp/ ${MKDIR} ${DOCSDIR}/emacs-lisp/mgp-el - for i in ${EMACS_LISPS}; do \ - ${INSTALL_DATA} ${WRKSRC}/contrib/$$i ${DOCSDIR}/emacs-lisp/$$i; \ - done + cd ${WRKSRC}/contrib/mgp-el && \ + ${INSTALL_DATA} ${EMACS_LISPS_MGP} ${DOCSDIR}/emacs-lisp/mgp-el ${MKDIR} ${DOCSDIR}/scripts - for i in ${SAMPLE_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/$$i ${DOCSDIR}/scripts/$$i; \ - done + cd ${WRKSRC}/contrib && \ + ${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} ${DOCSDIR}/scripts/ .endif .include <bsd.port.post.mk> diff --git a/misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in b/misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in new file mode 100644 index 000000000000..7d11756affe5 --- /dev/null +++ b/misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in @@ -0,0 +1,25 @@ +--- contrib/xmindpath/Makefile.in.orig 2000-01-31 14:04:30.000000000 +0900 ++++ contrib/xmindpath/Makefile.in 2008-11-06 23:57:53.000000000 +0900 +@@ -16,16 +16,19 @@ + bindir= @bindir@ + mandir= @mandir@ + +-all: $(TARGET) ++all: $(TARGET) $(TARGET).1 + $(TARGET): $(OBJS) + $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) + ++$(TARGET).1.gz: $(TARGET).1 ++ gzip $(TARGET).1 ++ + main.o: $(srcdir)/main.c + uucplock.o: $(srcdir)/uucplock.c + +-install:: ++install:: $(TARGET) $(TARGET).1.gz + $(INSTALL) -s -o uucp -g bin -m 4755 $(TARGET) $(bindir) +- $(INSTALL) -o bin -g bin -m 444 $(TARGET).1 $(mandir)/man1 ++ $(INSTALL) -o bin -g bin -m 444 $(TARGET).1.gz $(mandir)/man1 + + includes:: + diff --git a/misc/magicpoint/files/patch-image-rlelib.c b/misc/magicpoint/files/patch-image-rlelib.c new file mode 100644 index 000000000000..9fdb508e98fa --- /dev/null +++ b/misc/magicpoint/files/patch-image-rlelib.c @@ -0,0 +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 +@@ -13,7 +13,7 @@ + #include <stdio.h> + #include <math.h> + #if 0 +-#include <varargs.h> ++#include <stdarg.h> + #endif + #include <ctype.h> + diff --git a/misc/magicpoint/files/patch-sample::default.mgp b/misc/magicpoint/files/patch-sample::default.mgp new file mode 100644 index 000000000000..fb6b46a28a99 --- /dev/null +++ b/misc/magicpoint/files/patch-sample::default.mgp @@ -0,0 +1,15 @@ +--- sample/default.mgp.orig Sat Aug 11 01:40:54 2001 ++++ sample/default.mgp Tue Jan 25 13:56:12 2005 +@@ -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. diff --git a/misc/magicpoint/pkg-plist b/misc/magicpoint/pkg-plist index 7b892eefd295..d89a4e753177 100644 --- a/misc/magicpoint/pkg-plist +++ b/misc/magicpoint/pkg-plist @@ -8,62 +8,4 @@ lib/X11/mgp/default.mgp lib/X11/mgp/mgp1.jpg lib/X11/mgp/mgp2.jpg lib/X11/mgp/mgp3.jpg -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.fonts -%%PORTDOCS%%%%DOCSDIR%%/README.fonts.jp -%%PORTDOCS%%%%DOCSDIR%%/README.lang -%%PORTDOCS%%%%DOCSDIR%%/RELNOTES -%%PORTDOCS%%%%DOCSDIR%%/SYNTAX -%%PORTDOCS%%%%DOCSDIR%%/TODO.jp -%%PORTDOCS%%%%DOCSDIR%%/USAGE -%%PORTDOCS%%%%DOCSDIR%%/USAGE.jp -%%PORTDOCS%%%%DOCSDIR%%/sample/README -%%PORTDOCS%%%%DOCSDIR%%/sample/README.jp -%%PORTDOCS%%%%DOCSDIR%%/sample/cloud.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/dad.eps -%%PORTDOCS%%%%DOCSDIR%%/sample/dad.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/default.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/embed-jp.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/embed.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/gradation-jp.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/gradation.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp-old1.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp-old2.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp-old3.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp.mng -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp1.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp2.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp3.jpg -%%PORTDOCS%%%%DOCSDIR%%/sample/mgp3.xbm -%%PORTDOCS%%%%DOCSDIR%%/sample/mgprc-sample -%%PORTDOCS%%%%DOCSDIR%%/sample/multilingual.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/sample-fr.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/sample-jp.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/sample.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/sendmail6-jp.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/sendmail6.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/tutorial-jp.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/tutorial.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/v6-jp.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/v6.mgp -%%PORTDOCS%%%%DOCSDIR%%/sample/v6header.eps -%%PORTDOCS%%%%DOCSDIR%%/sample/v6header.jpg -%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/COPYING -%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/README -%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/mgp.el -%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/mgp.sty -%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/sample.tex -%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-mode.el -%%PORTDOCS%%%%DOCSDIR%%/scripts/eqn2eps.sh -%%PORTDOCS%%%%DOCSDIR%%/scripts/tex2eps.sh -%%PORTDOCS%%%%DOCSDIR%%/scripts/mgp2html.pl -%%PORTDOCS%%%%DOCSDIR%%/scripts/mgp2latex.pl -%%PORTDOCS%%@dirrm %%DOCSDIR%%/emacs-lisp/mgp-el -%%PORTDOCS%%@dirrm %%DOCSDIR%%/emacs-lisp -%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts -%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/X11/mgp |