Date: Fri, 28 May 1999 14:49:03 +0900 From: =?iso-2022-jp?B?GyRCJEokKyQ4GyhC?= <nakaji@tutrp.tut.ac.jp> To: gnats-admin@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: Re: ports/11813: [New port] gnuplot+ Message-ID: <19990528144903C.nakaji@tutrp.tut.ac.jp> In-Reply-To: <199905210140.SAA02781@freefall.freebsd.org> References: <19990521013946.C79B314D4B@hub.freebsd.org> <199905210140.SAA02781@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Next_Part(Fri_May_28_14:47:13_1999_559)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Two more patch. One (diff.990524) is to install gnuplot.info and the
other (patch-aa) is a replacement to use libVFlib2.so to use Japanese
characters in the graphs.
Please check.
----====----====----====----
NAKAJI Hiroyuki ($BCf<#(B $B909T(B)
----Next_Part(Fri_May_28_14:47:13_1999_559)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff.990524"
diff -aruN /home/nakaji/tmp/gnuplot+/Makefile ./Makefile
--- /home/nakaji/tmp/gnuplot+/Makefile Wed May 19 15:07:33 1999
+++ ./Makefile Mon May 24 15:01:52 1999
@@ -42,7 +42,10 @@
${WRKSRC}/INSTALL.unx.plus \
${WRKSRC}/INSTALL.win.plus \
${WRKSRC}/README-J.plus \
- ${WRKSRC}/README.plus
+ ${WRKSRC}/README.plus \
+ ${WRKSRC}/gp+/plus-asc.dvi \
+ ${WRKSRC}/gp+/plus-ntt.dvi \
+ ${WRKSRC}/gp+/plus.tex
post-extract:
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7+1.1.8.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
@@ -57,9 +60,15 @@
pre-build:
find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+post-build:
+ cd ${WRKSRC}/docs; ${GMAKE} info
+ cd ${WRKSRC}/docs; ${PATCH} --quiet -E -p1 < ${FILESDIR}/gnuplot.info.diff
+
post-install:
@test -d ${PREFIX}/share/doc/gnuplot+ || ${MKDIR} ${PREFIX}/share/doc/gnuplot+
- @${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+
+ ${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+
+ ${INSTALL_DATA} ${WRKSRC}/docs/gnuplot.info ${PREFIX}/info
+ install-info ${PREFIX}/info/gnuplot.info ${PREFIX}/info/dir
@${CAT} ${PKGDIR}/MESSAGE
.include <bsd.port.mk>
diff -aruN /home/nakaji/tmp/gnuplot+/files/gnuplot.info.diff ./files/gnuplot.info.diff
--- /home/nakaji/tmp/gnuplot+/files/gnuplot.info.diff Thu Jan 1 09:00:00 1970
+++ ./files/gnuplot.info.diff Mon May 24 14:51:14 1999
@@ -0,0 +1,13 @@
+--- /home/nakaji/tmp/gnuplot.info Mon May 24 14:47:28 1999
++++ ./gnuplot.info Mon May 24 14:49:54 1999
+@@ -1,5 +1,10 @@
+ This file is gnuplot.info created by doc2info from ./gnuplot.doc.
+
++INFO-DIR-SECTION 2-D graph tools
++START-INFO-DIR-ENTRY
++* Gnuplot: (gnuplot). An Interactive Plotting Program.
++END-INFO-DIR-ENTRY
++
+
+ File: gnuplot.info, Node: Top, Prev: (dir), Next: gnuplot, Up: (dir)
+
diff -aruN /home/nakaji/tmp/gnuplot+/pkg/PLIST ./pkg/PLIST
--- /home/nakaji/tmp/gnuplot+/pkg/PLIST Wed May 19 14:19:33 1999
+++ ./pkg/PLIST Mon May 24 15:02:20 1999
@@ -10,4 +10,9 @@
share/doc/gnuplot+/INSTALL.win.plus
share/doc/gnuplot+/README-J.plus
share/doc/gnuplot+/README.plus
+share/doc/gnuplot+/plus-asc.dvi
+share/doc/gnuplot+/plus-ntt.dvi
+share/doc/gnuplot+/plus.tex
@dirrm share/doc/gnuplot+
+@unexec install-info --delete %D/info/gnuplot.info %D/info/dir
+@exec install-info %D/info/gnuplot.info %D/info/dir
----Next_Part(Fri_May_28_14:47:13_1999_559)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch-aa
--- configure.in.orig Mon May 24 16:41:16 1999
+++ configure.in Mon May 24 16:47:57 1999
@@ -347,9 +347,9 @@
dnl check for VFlib
if test "$with_vflib" != no || test "$with_gd" != no; then
- gp_SEARCH_LIBDIRS(VFlib,VF_Init)
+ gp_SEARCH_LIBDIRS(VFlib2,VF_Init,[-lttf])
if test "$with_vflib" != no; then
- if test "$ac_cv_lib_VFlib_VF_Init" = yes; then
+ if test "$ac_cv_lib_VFlib2_VF_Init" = yes; then
gp_SEARCH_HEADERDIRS(VF.h,,
AC_MSG_WARN([please add path to VFlib.h to INCLUDES in Makefile])
)dnl gp_SEARCH_HEADERDIRS
@@ -358,15 +358,16 @@
AC_MSG_RESULT([- you cannot handle Japanese texts on some terminals without VFlib])
fi
fi
+ gp_SEARCH_LIBDIRS(ttf, TT_Init_FreeType)
fi
dnl end vflib
dnl check for Tom Boutell's gd library
if test "$with_gd" != no; then
if test "$ac_cv_lib_VFlib_VF_Init" = yes; then
- gp_SEARCH_LIBDIRS(gd,gdSetKanjiFont,[-lVFlib])
+ gp_SEARCH_LIBDIRS(gd,gdSetKanjiFont,[-lVFlib2 -lttf])
if test "$ac_cv_lib_gd_gdSetKanjiFont" = yes; then
- gp_SEARCH_HEADERDIRS(gd.h,,
+ gp_SEARCH_HEADERDIRS(gd/gd.h,,
AC_MSG_WARN([please add path to gd.h to INCLUDES in Makefile])
)dnl gp_SEARCH_HEADERDIRS
AC_DEFINE(HAVE_LIBGD)
@@ -374,7 +375,7 @@
else
gp_SEARCH_LIBDIRS(gd,gdImageCreate)
if test "$ac_cv_lib_gd_gdImageCreate" = yes; then
- gp_SEARCH_HEADERDIRS(gd.h,,
+ gp_SEARCH_HEADERDIRS(gd/gd.h,,
AC_MSG_WARN([please add path to gd.h to INCLUDES in Makefile])
)dnl gp_SEARCH_HEADERDIRS
AC_DEFINE(HAVE_LIBGD)
@@ -386,7 +387,7 @@
else
gp_SEARCH_LIBDIRS(gd,gdImageCreate)
if test "$ac_cv_lib_gd_gdImageCreate" = yes; then
- gp_SEARCH_HEADERDIRS(gd.h,,
+ gp_SEARCH_HEADERDIRS(gd/gd.h,,
AC_MSG_WARN([found gd library but not gd.h])
AC_MSG_WARN([please add path to gd.h to CPPFLAGS in Makefile])
)dnl gp_SEARCH_HEADERDIRS
----Next_Part(Fri_May_28_14:47:13_1999_559)----
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990528144903C.nakaji>