View | Details | Raw Unified | Return to bug 46946
Collapse All | Expand All

(-)print/cjk-lyx/Makefile (-9 / +11 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	lyx
8
PORTNAME=	lyx
9
PORTVERSION=	1.2.1
9
PORTVERSION=	1.2.3
10
CATEGORIES=	print
10
CATEGORIES=	print
11
MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
11
MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
12
PKGNAMEPREFIX=	cjk-
12
PKGNAMEPREFIX=	cjk-
Lines 28-38 Link Here
28
USE_PERL5=	yes
28
USE_PERL5=	yes
29
USE_GMAKE=	yes
29
USE_GMAKE=	yes
30
USE_AUTOMAKE_VER=	15
30
USE_AUTOMAKE_VER=	15
31
AUTOMAKE=	${WRKSRC}/autogen.sh
32
AUTOCONF=	${TRUE}
33
CONFIGURE_ENV=	CPPFLAGS="-DI18N"
31
CONFIGURE_ENV=	CPPFLAGS="-DI18N"
32
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
34
CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
33
CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
35
		--with-extra-inc="${LOCALBASE}/include"
34
		--with-extra-inc="${LOCALBASE}/include"
35
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
36
		AUTOHEADER="${TRUE}"
36
MAN1=		lyx.1 reLyX.1
37
MAN1=		lyx.1 reLyX.1
37
38
38
.if defined(WITH_ASPELL)
39
.if defined(WITH_ASPELL)
Lines 61-72 Link Here
61
	@${ECHO_MSG}
62
	@${ECHO_MSG}
62
.endif
63
.endif
63
64
64
post-extract:
65
	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
66
67
post-patch:
65
post-patch:
68
	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
66
.for file in src/Makefile.am src/frontends/Makefile.am
69
		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
67
	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
70
		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
68
.endfor
69
.for file in configure.in lib/reLyX/configure.in
70
	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
71
		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
72
.endfor
71
73
72
.include <bsd.port.mk>
74
.include <bsd.port.mk>
(-)print/cjk-lyx/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (CJK-LyX-1.2.1-src.tar.gz) = ac07a60f1e3446e4c58631e2dca2cc95
1
MD5 (CJK-LyX-1.2.3-src.tar.gz) = 30eab39df47ab8fc36863bdaa0d76c4d
(-)print/cjk-lyx/files/patch-autogen.sh (-32 lines)
Lines 1-32 Link Here
1
--- autogen.sh.orig	Thu Apr 18 22:11:28 2002
2
+++ autogen.sh	Fri Jun 28 21:55:35 2002
3
@@ -1,9 +1,9 @@
4
 #!/bin/sh
5
 
6
 ACLOCAL=aclocal
7
-AUTOHEADER=autoheader
8
+AUTOHEADER=autoheader213
9
 AUTOMAKE="automake -a -c --foreign"
10
-AUTOCONF=autoconf
11
+AUTOCONF=autoconf213
12
 GNUM4=
13
 
14
 ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
15
@@ -31,7 +31,7 @@
16
 echo "done."
17
 
18
 # Generate the Makefiles and configure files
19
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
20
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
21
 	echo "Building macros..."
22
 	for dir in . lib/reLyX sigc++ ; do
23
 	    echo "        $dir"
24
@@ -43,7 +43,7 @@
25
 	exit
26
 fi
27
 
28
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
29
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
30
 	echo "Building config header template..."
31
 	for dir in . sigc++ ; do
32
 	    echo "        $dir"
(-)print/cjk-lyx/files/patch-config::pspell.m4 (-20 lines)
Lines 1-20 Link Here
1
--- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
2
+++ config/pspell.m4	Wed Oct  2 22:10:21 2002
3
@@ -12,7 +12,7 @@
4
         fi
5
       ])
6
 
7
-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
8
+    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
9
       pspell_use_include="$withval",
10
       pspell_use_include=NONE)
11
 
12
@@ -22,7 +22,7 @@
13
       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
14
     fi
15
 
16
-    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
17
+    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
18
       pspell_use_lib="$withval",
19
       pspell_use_lib=NONE)
20
 
(-)print/cjk-lyx/files/patch-src::FontLoader.C (-12 lines)
Lines 1-12 Link Here
1
--- src/FontLoader.C.orig	Fri Mar 22 02:25:07 2002
2
+++ src/FontLoader.C	Fri Aug 23 03:38:09 2002
3
@@ -300,7 +300,8 @@
4
 		if (font == "fixed") {
5
 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
6
 		} else {
7
-			lyxerr << "Could not get font. Using 'fixed'." << endl;
8
+			lyxerr << "Could not get font '" << font.c_str() <<
9
+				"'. Using 'fixed'." << endl;
10
 			fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
11
 		}
12
 	} else if (lyxerr.debugging(Debug::FONT)) {
(-)print/cjk-lyx/files/xforms.m4 (-98 lines)
Lines 1-98 Link Here
1
dnl some macros to test for xforms-related functionality  -*- sh -*-
2
3
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
4
dnl   If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
5
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
6
AC_DEFUN(LYX_PATH_XFORMS,[
7
AC_REQUIRE([LYX_PATH_XPM])
8
9
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
10
  [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
11
    [LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
12
AC_SUBST(XFORMS_LIB)
13
14
### Check for xforms headers
15
lyx_cv_forms_h_location="<forms.h>"
16
AC_CHECK_HEADER(X11/forms.h,[
17
  ac_cv_header_forms_h=yes
18
  lyx_cv_forms_h_location="<X11/forms.h>"],[
19
AC_CHECK_HEADER(forms.h,[],[
20
LYX_LIB_ERROR(forms.h,forms)])])
21
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
22
   [define this to the location of forms.h to be used with #include, e.g. <forms.h>])
23
24
if test $ac_cv_header_forms_h = yes; then
25
  AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
26
  [ cat > conftest.$ac_ext <<EOF
27
#line __oline__ "configure"
28
#include "confdefs.h"
29
30
#include FORMS_H_LOCATION
31
#if ! defined(FL_INCLUDE_VERSION)
32
"%%%"(unknown)"%%%"
33
#else
34
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
35
#endif
36
EOF
37
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
38
  grep '^"%%%"'  2>/dev/null | \
39
  sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
40
rm -f conftest*])
41
42
XFORMS_VERSION=$lyx_cv_xfversion
43
case "$lyx_cv_xfversion" in
44
  "(unknown)"|0.8[1-7]*)
45
	 LYX_ERROR(dnl
46
Version $lyx_cv_xfversion of xforms is not compatible with LyX.
47
   This version of LyX works best with versions 0.88 (recommended) and later.) ;;
48
    0.88*) ;;
49
    0.89[01234]) LYX_WARNING(dnl
50
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
51
it is an unproven version and might still have some bugs. You should
52
probably use version 0.89.6 (or 0.88) instead) ;;
53
    0.89*) ;;
54
    0.9999*) ;;
55
    1.0*) ;;
56
       *) LYX_WARNING(dnl
57
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
58
 since it is newer than 0.89. You might have slight problems with it.);;
59
esac
60
fi
61
])
62
63
64
65
dnl Check whether the xforms library has a viable image loader
66
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
67
[AC_REQUIRE([LYX_PATH_XFORMS])
68
save_LIBS=$LIBS
69
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
70
lyx_use_xforms_image_loader=no
71
AC_LANG_SAVE
72
AC_LANG_C
73
74
AC_CHECK_LIB(jpeg, jpeg_read_header,
75
  [XFORMS_IMAGE_LIB=-ljpeg
76
   LIBS="$LIBS -ljpeg"])
77
AC_SEARCH_LIBS(flimage_dup, flimage,
78
  [lyx_use_xforms_image_loader=yes
79
   if test "$ac_cv_search_flimage_dup" != "none required" ; then
80
     XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
81
     LIBS="$XFORMS_IMAGE_LIB $LIBS"
82
  fi])
83
AC_SUBST(XFORMS_IMAGE_LIB)
84
85
if test $lyx_use_xforms_image_loader = yes ; then
86
  lyx_flags="$lyx_flags xforms-image-loader"
87
  AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
88
	    [Define if you want to use xforms built-in image loader])
89
  AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
90
  AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
91
fi
92
93
### If the gui cannot load images itself, then we default to the
94
### very simple one in graphics/GraphicsImageXPM.[Ch]
95
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
96
	       test $lyx_use_xforms_image_loader = no)
97
AC_LANG_RESTORE
98
LIBS=$save_LIBS])
(-)print/cjk-lyx/pkg-plist (+7 lines)
Lines 83-88 Link Here
83
share/lyx/doc/fr_UserGuide.lyx
83
share/lyx/doc/fr_UserGuide.lyx
84
share/lyx/doc/he_Intro.lyx
84
share/lyx/doc/he_Intro.lyx
85
share/lyx/doc/he_TOC.lyx
85
share/lyx/doc/he_TOC.lyx
86
share/lyx/doc/he_Tutorial.lyx
86
share/lyx/doc/hu_Intro.lyx
87
share/lyx/doc/hu_Intro.lyx
87
share/lyx/doc/hu_TOC.lyx
88
share/lyx/doc/hu_TOC.lyx
88
share/lyx/doc/it_Customization.lyx
89
share/lyx/doc/it_Customization.lyx
Lines 104-109 Link Here
104
share/lyx/doc/ro_Intro.lyx
105
share/lyx/doc/ro_Intro.lyx
105
share/lyx/doc/ro_TOC.lyx
106
share/lyx/doc/ro_TOC.lyx
106
share/lyx/doc/ro_splash.lyx
107
share/lyx/doc/ro_splash.lyx
108
share/lyx/doc/ru_FAQ.lyx
107
share/lyx/doc/ru_Intro.lyx
109
share/lyx/doc/ru_Intro.lyx
108
share/lyx/doc/ru_TOC.lyx
110
share/lyx/doc/ru_TOC.lyx
109
share/lyx/doc/ru_Tutorial.lyx
111
share/lyx/doc/ru_Tutorial.lyx
Lines 155-160 Link Here
155
share/lyx/examples/fr_exemple_lyxifie.lyx
157
share/lyx/examples/fr_exemple_lyxifie.lyx
156
share/lyx/examples/fr_mathed.lyx
158
share/lyx/examples/fr_mathed.lyx
157
share/lyx/examples/fr_splash.lyx
159
share/lyx/examples/fr_splash.lyx
160
share/lyx/examples/he_example_raw.lyx
161
share/lyx/examples/he_he_example_lyxified.lyx
162
share/lyx/examples/he_he_example_raw.lyx
158
share/lyx/examples/hu_splash.lyx
163
share/lyx/examples/hu_splash.lyx
159
share/lyx/examples/iecc05.fen
164
share/lyx/examples/iecc05.fen
160
share/lyx/examples/iecc07.fen
165
share/lyx/examples/iecc07.fen
Lines 331-336 Link Here
331
share/lyx/layouts/heb-article.layout
336
share/lyx/layouts/heb-article.layout
332
share/lyx/layouts/heb-letter.layout
337
share/lyx/layouts/heb-letter.layout
333
share/lyx/layouts/hollywood.layout
338
share/lyx/layouts/hollywood.layout
339
share/lyx/layouts/ijmpd.layout
334
share/lyx/layouts/kluwer.layout
340
share/lyx/layouts/kluwer.layout
335
share/lyx/layouts/latex8.layout
341
share/lyx/layouts/latex8.layout
336
share/lyx/layouts/letter.layout
342
share/lyx/layouts/letter.layout
Lines 404-409 Link Here
404
share/lyx/templates/g-brief-de.lyx
410
share/lyx/templates/g-brief-de.lyx
405
share/lyx/templates/g-brief-en.lyx
411
share/lyx/templates/g-brief-en.lyx
406
share/lyx/templates/hollywood.lyx
412
share/lyx/templates/hollywood.lyx
413
share/lyx/templates/ijmpd.lyx
407
share/lyx/templates/kluwer.lyx
414
share/lyx/templates/kluwer.lyx
408
share/lyx/templates/latex8.lyx
415
share/lyx/templates/latex8.lyx
409
share/lyx/templates/letter.lyx
416
share/lyx/templates/letter.lyx

Return to bug 46946