diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2006-02-01 01:43:42 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2006-02-01 01:43:42 +0800 |
| commit | 096aab9345d2c15aac8d182eb56911493b7ff282 (patch) | |
| tree | 7bb66d5d696910bfaa9c21a2f8e1bb99e95c3f0f | |
| parent | e85c862163bf9bf6958570f3c31622dde409c058 (diff) | |
| download | freebsd-ports-gnome-096aab9345d2c15aac8d182eb56911493b7ff282.tar.gz freebsd-ports-gnome-096aab9345d2c15aac8d182eb56911493b7ff282.tar.zst freebsd-ports-gnome-096aab9345d2c15aac8d182eb56911493b7ff282.zip | |
- Fix compile error on 4-stable [*].
- Add dependency on perl5 port to fix build error regarding intltool-merge on 4-stable.
Reported by: kris [*]
| -rw-r--r-- | textproc/uim/Makefile | 12 | ||||
| -rw-r--r-- | textproc/uim/files/extra-patch-uim_editline.c | 22 |
2 files changed, 33 insertions, 1 deletions
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 1a12edee204d..0e670e171951 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -15,7 +15,6 @@ COMMENT= Input method library USE_X_PREFIX= yes USE_REINPLACE= yes -USE_PERL5_BUILD=yes INSTALLS_SHLIB= yes WANT_GNOME= yes USE_GNOME= gnometarget glib20 @@ -45,6 +44,17 @@ PLIST_SUB= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" .include <bsd.port.pre.mk> +.if ${OSVERSION} < 500000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_editline.c +.endif + +.if ${PERL_LEVEL} >= 500600 +USE_PERL5_BUILD=yes +.else +BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:${PORTSDIR}/lang/perl5 +CONFIGURE_ENV+= INTLTOOL_PERL="${LOCALBASE}/bin/perl" +.endif + .if defined(WITH_GTK) && !defined(WITHOUT_GTK) USE_GNOME+= gtk20 CONFIGURE_ARGS+=--with-gtk2 diff --git a/textproc/uim/files/extra-patch-uim_editline.c b/textproc/uim/files/extra-patch-uim_editline.c new file mode 100644 index 000000000000..15f3936183fa --- /dev/null +++ b/textproc/uim/files/extra-patch-uim_editline.c @@ -0,0 +1,22 @@ +--- uim/editline.c.orig Wed Dec 7 21:39:32 2005 ++++ uim/editline.c Tue Jan 31 01:48:45 2006 +@@ -52,6 +52,10 @@ + + #include "editline.h" + ++#ifndef H_SETSIZE ++#define H_SETSIZE 1 ++#endif ++ + static EditLine *el; + static History *hist; + static HistEvent hev; +@@ -65,7 +69,7 @@ + void + editline_init(void) + { +- el = el_init("uim", stdin, stdout, stderr); ++ el = el_init("uim", stdin, stdout); + el_set(el, EL_PROMPT, &prompt); + el_set(el, EL_EDITOR, "emacs"); + |