diff options
| -rw-r--r-- | x11/mlterm/Makefile | 10 | ||||
| -rw-r--r-- | x11/mlterm/PLIST | 7 | ||||
| -rw-r--r-- | x11/mlterm/distinfo | 9 | ||||
| -rw-r--r-- | x11/mlterm/options.mk | 20 |
4 files changed, 30 insertions, 16 deletions
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 7ccf3eef23a..46e1b1d5c8f 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.124 2015/12/19 11:43:24 tsutsui Exp $ +# $NetBSD: Makefile,v 1.125 2016/02/14 14:04:16 tsutsui Exp $ -DISTNAME= mlterm-3.6.1 +DISTNAME= mlterm-3.6.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} @@ -37,7 +37,7 @@ INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples SUBST_CLASSES+= link SUBST_MESSAGE.link= Fixing hardcoded paths and link options in Makefiles. -SUBST_STAGE.link= post-patch +SUBST_STAGE.link= pre-configure SUBST_FILES.link= Makefile.in */Makefile.in */*/Makefile.in \ */*/*/Makefile.in SUBST_SED.link= -e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS:M*:Q}|g' @@ -47,14 +47,14 @@ SUBST_SED.link+= -e 's|/usr/X11R7/|${X11BASE}/|g' SUBST_CLASSES+= man SUBST_MESSAGE.man= Fixing hardcoded paths in man pages. -SUBST_STAGE.man= post-patch +SUBST_STAGE.man= pre-configure SUBST_FILES.man= man/mlterm.1 SUBST_SED.man= -e 's|/usr/X11R6/lib/X11/mlterm/|${PKG_SYSCONFDIR}/|g' SUBST_SED.man+= -e 's|/usr/X11R6/include/|${X11BASE}/include/|g' SUBST_CLASSES+= conf SUBST_MESSAGE.conf= Fixing hardcoded paths in config files. -SUBST_STAGE.conf= post-patch +SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= etc/font-fb SUBST_SED.conf= -e 's|/usr/X11R7/|${X11BASE}/|g' SUBST_SED.conf+= -e 's|/usr/pkg/|${PREFIX}/|g' diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index 9c70a89007c..b524b77f6f4 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.34 2015/12/19 11:43:24 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.35 2016/02/14 14:04:16 tsutsui Exp $ bin/mlcc bin/mlclient bin/mlclientx @@ -40,13 +40,14 @@ ${PLIST.ind}lib/mlterm/libind_punjabi.la ${PLIST.ind}lib/mlterm/libind_roman.la ${PLIST.ind}lib/mlterm/libind_tamil.la ${PLIST.ind}lib/mlterm/libind_telugu.la -${PLIST.cairo}lib/mlterm/libtype_cairo.la -${PLIST.xft2}lib/mlterm/libtype_xft.la lib/mlterm/libmotif.la lib/mlterm/libmozmodern.la +${PLIST.otl}lib/mlterm/libotl.la lib/mlterm/libnext.la lib/mlterm/libpixmap_engine.la lib/mlterm/libsample.la +${PLIST.cairo}lib/mlterm/libtype_cairo.la +${PLIST.xft2}lib/mlterm/libtype_xft.la libexec/mlterm/mlconfig libexec/mlterm/mlimgloader libexec/mlterm/mlterm-menu diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 810b951b39f..2aba487e757 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.62 2015/12/19 11:43:24 tsutsui Exp $ +$NetBSD: distinfo,v 1.63 2016/02/14 14:04:16 tsutsui Exp $ -SHA1 (mlterm-3.6.1.tar.gz) = 53ae7f9e41696102adc0b797b9cd28a875ae4e79 -RMD160 (mlterm-3.6.1.tar.gz) = 2463e30ce46429134bd2a967c2cb8a02b9b9c897 -Size (mlterm-3.6.1.tar.gz) = 3756686 bytes +SHA1 (mlterm-3.6.3.tar.gz) = b069a0bc47a5bcb4256ebb87294c9451ed25c5c6 +RMD160 (mlterm-3.6.3.tar.gz) = f83fcdb91ea8af3b62afd2bfd03b838dee48f77f +SHA512 (mlterm-3.6.3.tar.gz) = bbc6c61422f81a793b64fcbabb972765f7e544c7d4fc3d8874ab78a25fe8e7a97dc96c3d44e582127dde8822e7c254ed58004535524e361a2a0d91410e7ef027 +Size (mlterm-3.6.3.tar.gz) = 3677639 bytes SHA1 (patch-configure) = 686754205102c2ffeb2456b4fad77f72b1a992a6 SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00 diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk index faab8ba6670..e11ce526b13 100644 --- a/x11/mlterm/options.mk +++ b/x11/mlterm/options.mk @@ -1,15 +1,15 @@ -# $NetBSD: options.mk,v 1.10 2015/12/19 11:43:24 tsutsui Exp $ +# $NetBSD: options.mk,v 1.11 2016/02/14 14:04:16 tsutsui Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm -PKG_SUPPORTED_OPTIONS= cairo canna fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb scim uim wnn4 xft2 -PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 xft2 +PKG_SUPPORTED_OPTIONS= cairo canna fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb otl scim uim wnn4 xft2 +PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 m17nlib otl xft2 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" PKG_SUGGESTED_OPTIONS+= mlterm-fb .endif .include "../../mk/bsd.options.mk" -PLIST_VARS+= bidi cairo canna fb ibus ind m17nlib scim uim wnn xft2 +PLIST_VARS+= bidi cairo canna fb ibus ind m17nlib otl scim uim wnn xft2 .if !empty(PKG_OPTIONS:Mmlterm-fb) CONFIGURE_ARGS+= --with-gui=xlib,fb @@ -69,6 +69,14 @@ PLIST.m17nlib= yes CONFIGURE_ARGS+= --disable-m17nlib .endif +.if !empty(PKG_OPTIONS:Motl) +.include "../../fonts/harfbuzz/buildlink3.mk" +CONFIGURE_ARGS+= --enable-otl +PLIST.otl= yes +.else +CONFIGURE_ARGS+= --disable-otl +.endif + .if !empty(PKG_OPTIONS:Mscim) .include "../../inputmethod/scim/buildlink3.mk" CONFIGURE_ARGS+= --enable-scim @@ -103,6 +111,10 @@ PLIST.xft2= yes .if !empty(PKG_OPTIONS:Mcairo) && !empty(PKG_OPTIONS:Mxft2) CONFIGURE_ARGS+= --with-type-engines=xcore,xft,cairo +.if !empty(PKG_OPTIONS:Mmlterm-fb) +# --enable-anti-alias is also required for mlterm-fb +CONFIGURE_ARGS+= --enable-anti-alias +.endif .elif !empty(PKG_OPTIONS:Mcairo) CONFIGURE_ARGS+= --with-type-engines=xcore,cairo .elif !empty(PKG_OPTIONS:Mxft2) |