mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-27 00:57:50 +00:00
Update to 1.3.4-1.
PR: ports/63753 Submitted by: Ports Fury Approved by: maintainer timeout (>2 months)
This commit is contained in:
Mark Linimon
parent
667b0fceac
commit
13001e130c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=110159
@ -6,47 +6,59 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= lyx
|
PORTNAME= lyx
|
||||||
PORTVERSION= 1.2.3
|
PORTVERSION= 1.3.4.1
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= print
|
CATEGORIES= print
|
||||||
MASTER_SITES= ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
|
MASTER_SITES= ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/
|
||||||
PKGNAMEPREFIX= cjk-
|
PKGNAMEPREFIX= cjk-
|
||||||
DISTNAME= CJK-LyX-${PORTVERSION}-src
|
DISTNAME= CJK-LyX-qt-${PORTVERSION:R}-${PORTVERSION:E}.src
|
||||||
|
|
||||||
MAINTAINER= cjh@FreeBSD.org
|
MAINTAINER= cjh@FreeBSD.org
|
||||||
COMMENT= Document processor interfaced with LaTeX, with CJK support
|
COMMENT= Document processor interfaced with LaTeX, with CJK support
|
||||||
|
|
||||||
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||||
latex:${PORTSDIR}/print/teTeX
|
latex:${PORTSDIR}/print/teTeX \
|
||||||
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
|
makepsres:${PORTSDIR}/x11/XFree86-4-clients
|
||||||
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||||
latex:${PORTSDIR}/print/teTeX
|
latex:${PORTSDIR}/print/teTeX
|
||||||
|
|
||||||
WRKSRC= ${WRKDIR}/CJK-LyX-${PORTVERSION}
|
WRKSRC= ${WRKDIR}/CJK-LyX-qt-${PORTVERSION:R}
|
||||||
|
|
||||||
USE_GETTEXT= yes
|
CONFLICTS= lyx-*
|
||||||
USE_XPM= yes
|
|
||||||
USE_REINPLACE= yes
|
USE_QT_VER= 3
|
||||||
|
USE_GNOME= gnometarget lthack
|
||||||
USE_PERL5= yes
|
USE_PERL5= yes
|
||||||
|
USE_PYTHON= yes
|
||||||
|
USE_GETTEXT= yes
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
USE_AUTOMAKE_VER= 15
|
USE_LIBTOOL= yes
|
||||||
CONFIGURE_ENV= CPPFLAGS="-DI18N"
|
CONFIGURE_ARGS= --with-frontend=qt \
|
||||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
--with-extra-lib="${LOCALBASE}/lib" \
|
||||||
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
|
|
||||||
--with-extra-inc="${LOCALBASE}/include"
|
--with-extra-inc="${LOCALBASE}/include"
|
||||||
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
|
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
|
||||||
AUTOHEADER="${TRUE}"
|
AUTOHEADER="${TRUE}"
|
||||||
MAN1= lyx.1 reLyX.1
|
MAN1= lyx.1 reLyX.1
|
||||||
|
|
||||||
|
CFLAGS+= -DI18N
|
||||||
|
|
||||||
|
QTCPPFLAGS+= ${PTHREAD_CFLAGS}
|
||||||
|
QTCFGLIBS+= ${PTHREAD_LIBS}
|
||||||
|
|
||||||
.if defined(WITH_ASPELL)
|
.if defined(WITH_ASPELL)
|
||||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||||
CONFIGURE_ARGS+= --with-pspell \
|
CONFIGURE_ARGS+= --with-pspell \
|
||||||
--with-pspell-lib="${LOCALBASE}/lib" \
|
--with-pspell-lib="${LOCALBASE}/lib" \
|
||||||
--with-pspell-include="${LOCALBASE}/include"
|
--with-pspell-include="${LOCALBASE}/include"
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITH_ISPELL)
|
.if defined(WITH_ISPELL)
|
||||||
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
||||||
|
.endif
|
||||||
|
|
||||||
|
.include <bsd.port.pre.mk>
|
||||||
|
|
||||||
|
.if ${OSVERSION} < 500035
|
||||||
|
CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
pre-everything::
|
pre-everything::
|
||||||
@ -64,13 +76,4 @@ pre-everything::
|
|||||||
@${ECHO_MSG}
|
@${ECHO_MSG}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
post-patch:
|
.include <bsd.port.post.mk>
|
||||||
.for file in src/Makefile.am src/frontends/Makefile.am
|
|
||||||
@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
|
|
||||||
.endfor
|
|
||||||
.for file in configure.in lib/reLyX/configure.in
|
|
||||||
@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
|
|
||||||
s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
MD5 (CJK-LyX-1.2.3-src.tar.gz) = 30eab39df47ab8fc36863bdaa0d76c4d
|
MD5 (CJK-LyX-qt-1.3.4-1.src.tar.gz) = 7295bf28d2554a52e802f186f3d1026b
|
||||||
|
SIZE (CJK-LyX-qt-1.3.4-1.src.tar.gz) = 7501719
|
||||||
SIZE (CJK-LyX-1.2.3-src.tar.gz) = 6671283
|
SIZE (CJK-LyX-1.2.3-src.tar.gz) = 6671283
|
||||||
|
|||||||
@ -1,28 +0,0 @@
|
|||||||
--- config/ltmain.sh.orig Thu Jan 24 06:28:31 2002
|
|
||||||
+++ config/ltmain.sh Fri Jun 28 20:15:12 2002
|
|
||||||
@@ -1043,14 +1043,14 @@
|
|
||||||
# These systems don't actually have a C library (as such)
|
|
||||||
test "X$arg" = "X-lc" && continue
|
|
||||||
;;
|
|
||||||
- *-*-openbsd*)
|
|
||||||
+ *-*-openbsd* | *-*-freebsd*)
|
|
||||||
# Do not include libc due to us having libc/libc_r.
|
|
||||||
test "X$arg" = "X-lc" && continue
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
elif test "X$arg" = "X-lc_r"; then
|
|
||||||
case $host in
|
|
||||||
- *-*-openbsd*)
|
|
||||||
+ *-*-openbsd* | *-*-freebsd*)
|
|
||||||
# Do not include libc_r directly, use -pthread flag.
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
@@ -2441,7 +2441,7 @@
|
|
||||||
*-*-netbsd*)
|
|
||||||
# Don't link with libc until the a.out ld.so is fixed.
|
|
||||||
;;
|
|
||||||
- *-*-openbsd*)
|
|
||||||
+ *-*-openbsd* | *-*-freebsd*)
|
|
||||||
# Do not include libc due to us having libc/libc_r.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
94
print/cjk-lyx/files/patch-configure
Normal file
94
print/cjk-lyx/files/patch-configure
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
--- configure.orig Thu Feb 19 02:35:31 2004
|
||||||
|
+++ configure Tue Mar 2 01:03:20 2004
|
||||||
|
@@ -5304,33 +5304,51 @@
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
-
|
||||||
|
-echo "$as_me:$LINENO: checking for fopen in -lc" >&5
|
||||||
|
-echo $ECHO_N "checking for fopen in -lc... $ECHO_C" >&6
|
||||||
|
-if test "${ac_cv_lib_c_fopen+set}" = set; then
|
||||||
|
+echo "$as_me:$LINENO: checking for fopen" >&5
|
||||||
|
+echo $ECHO_N "checking for fopen... $ECHO_C" >&6
|
||||||
|
+if test "${ac_cv_func_fopen+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
- ac_check_lib_save_LIBS=$LIBS
|
||||||
|
-LIBS="-lc $LIBS"
|
||||||
|
-cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
+ cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line $LINENO "configure"
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
-
|
||||||
|
+/* System header to define __stub macros and hopefully few prototypes,
|
||||||
|
+ which can conflict with char fopen (); below.
|
||||||
|
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||||
|
+ <limits.h> exists even on freestanding compilers. */
|
||||||
|
+#ifdef __STDC__
|
||||||
|
+# include <limits.h>
|
||||||
|
+#else
|
||||||
|
+# include <assert.h>
|
||||||
|
+#endif
|
||||||
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
+{
|
||||||
|
#endif
|
||||||
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
char fopen ();
|
||||||
|
+/* The GNU C library defines this for functions which it implements
|
||||||
|
+ to always fail with ENOSYS. Some functions are actually named
|
||||||
|
+ something starting with __ and the normal name is an alias. */
|
||||||
|
+#if defined (__stub_fopen) || defined (__stub___fopen)
|
||||||
|
+choke me
|
||||||
|
+#else
|
||||||
|
+char (*f) () = fopen;
|
||||||
|
+#endif
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
-fopen ();
|
||||||
|
+return f != fopen;
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -5347,26 +5365,17 @@
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
- ac_cv_lib_c_fopen=yes
|
||||||
|
+ ac_cv_func_fopen=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
-ac_cv_lib_c_fopen=no
|
||||||
|
+ac_cv_func_fopen=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||||
|
-LIBS=$ac_check_lib_save_LIBS
|
||||||
|
-fi
|
||||||
|
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_fopen" >&5
|
||||||
|
-echo "${ECHO_T}$ac_cv_lib_c_fopen" >&6
|
||||||
|
-if test $ac_cv_lib_c_fopen = yes; then
|
||||||
|
- cat >>confdefs.h <<_ACEOF
|
||||||
|
-#define HAVE_LIBC 1
|
||||||
|
-_ACEOF
|
||||||
|
-
|
||||||
|
- LIBS="-lc $LIBS"
|
||||||
|
-
|
||||||
|
fi
|
||||||
|
+echo "$as_me:$LINENO: result: $ac_cv_func_fopen" >&5
|
||||||
|
+echo "${ECHO_T}$ac_cv_func_fopen" >&6
|
||||||
|
|
||||||
|
|
||||||
|
### Add extra directories to check for libraries.
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- src/WorkArea.C.orig Fri Aug 23 15:04:29 2002
|
|
||||||
+++ src/WorkArea.C Thu Oct 3 00:30:28 2002
|
|
||||||
@@ -409,9 +409,9 @@
|
|
||||||
KeySym keysym = 0;
|
|
||||||
#ifdef I18N
|
|
||||||
char s_r[256];
|
|
||||||
-#else
|
|
||||||
- char dummy[1];
|
|
||||||
+ int num_bytes;
|
|
||||||
#endif
|
|
||||||
+ char dummy[1];
|
|
||||||
XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
|
|
||||||
#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
|
|
||||||
// XForms < 0.89.5 does not have compose support
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- src/lyxcodeconv.C.orig Thu Jul 11 19:55:02 2002
|
|
||||||
+++ src/lyxcodeconv.C Thu Jul 11 19:55:36 2002
|
|
||||||
@@ -11,6 +11,10 @@
|
|
||||||
#include "LString.h"
|
|
||||||
#include "lyxcodeconv.h"
|
|
||||||
|
|
||||||
+#include <iostream>
|
|
||||||
+
|
|
||||||
+using namespace std;
|
|
||||||
+
|
|
||||||
LyXCodeConv codeconverter; //global
|
|
||||||
|
|
||||||
size_t LyXCodeConv::lyxmbstowcs(wchar_t *wcs, const char *cs, size_t n)
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- work/CJK-LyX-1.2.0/src/lyxcodeconv.h~ Thu Jul 11 15:18:49 2002
|
|
||||||
+++ src/lyxcodeconv.h Thu Jul 11 15:24:20 2002
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
#include <fstream>
|
|
||||||
#include <iomanip>
|
|
||||||
using std::ofstream;
|
|
||||||
+using std::ostream;
|
|
||||||
using std::ifstream;
|
|
||||||
using std::fstream;
|
|
||||||
using std::ios;
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- src/lyxim.C.orig Thu Jul 11 19:10:30 2002
|
|
||||||
+++ src/lyxim.C Thu Jul 11 19:16:31 2002
|
|
||||||
@@ -19,6 +19,10 @@
|
|
||||||
|
|
||||||
#define DUMMY_FONT_NAME "-*-*-*-R-Normal--14-130-75-75-*-*"
|
|
||||||
|
|
||||||
+#include <iostream>
|
|
||||||
+
|
|
||||||
+using namespace std;
|
|
||||||
+
|
|
||||||
//extern FD_form_main *fd_form_main;
|
|
||||||
extern MiniBuffer *minibuffer;
|
|
||||||
extern BufferView *current_view;
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- src/sp_spell.C.orig Mon Aug 12 19:25:50 2002
|
|
||||||
+++ src/sp_spell.C Fri Aug 23 03:38:09 2002
|
|
||||||
@@ -379,7 +379,7 @@
|
|
||||||
// Configure provides us with macros which are supposed to do
|
|
||||||
// the right typecast.
|
|
||||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
|
||||||
- SELECT_TYPE_ARG234 (&infds),
|
|
||||||
+ &infds,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
SELECT_TYPE_ARG5 (&tv));
|
|
||||||
@ -1,16 +1,10 @@
|
|||||||
CJK-LyX
|
LyX is a document processor interfaced with LaTeX, which gives both the
|
||||||
=======
|
ease-of-use of a wordprocessor, and the flexibility and power of
|
||||||
|
LaTeX.
|
||||||
|
|
||||||
CJK-LyX is a multibyte version of LyX, the text processing document
|
Quasi-WYSIWYG interface, many LaTeX styles and layouts automatically
|
||||||
processor, or simply a new and advanced kind of word processors.
|
generated. Speeds up learning LaTeX and makes complicated layouts
|
||||||
More specifically, CJK-LyX is the patched version of LyX for Chinese,
|
easy and intuitive. New features include spell-checking, international
|
||||||
Japanese and Korean language users.
|
character support, WYSIWYG graphics, tables, and equations.
|
||||||
|
|
||||||
CJK-LyX is based on the earlier patch against lyx-1.0.3 by Masahiko
|
WWW: http://www.lyx.org/
|
||||||
Kawakami <kawakami@din.or.jp> and critical contributions from
|
|
||||||
Chideok Hwang <hwang@mizi.co.kr>, who is also the author of the
|
|
||||||
Korean input method Ami.
|
|
||||||
|
|
||||||
--
|
|
||||||
CHOI Junho <cjh@FreeBSD.org>
|
|
||||||
WWW: http://cellular.phys.pusan.ac.kr/cjk.html
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user