* new upstream version 2.9.0

* added imagelib support, depends on gtk2 * SHARED_ONLY=yes From: Waldemar Brodkorb <[email protected]>
avsm · Dec 6, 2004 · a92c92f · a92c92f
1 parent b9fd17d
commit a92c92f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 59 deletions.
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2004/09/15 19:26:30 espie Exp $
-
-NOT_FOR_ARCHS=	vax
+# $OpenBSD: Makefile,v 1.4 2004/12/06 22:14:42 naddy Exp $
 
 COMMENT=	"color terminal emulator with transparency and unicode support"
-DISTNAME=	mlterm-2.8.0
+DISTNAME=	mlterm-2.9.0
 CATEGORIES=	x11
 
 MAINTAINER=	Waldemar Brodkorb <[email protected]>
@@ -16,27 +14,18 @@ PERMIT_DISTFILES_FTP=	Yes
 
 HOMEPAGE=	http://mlterm.sourceforge.net/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
-PATCHFILES=	${DISTNAME}pl1.tar.gz
 
 USE_X11=	Yes
+SHARED_ONLY=Yes
 
-LIB_DEPENDS=	gtk.1.2,gdk::x11/gtk+
+BUILD_DEPENDS=	:pkgconfig->=0.14.0p1:devel/pkgconfig
+LIB_DEPENDS=	gdk_pixbuf-2.0.0.14,gtk-x11-2.0.0.14::x11/gtk+2
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-anti-alias --enable-utmp
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/freetype2"
-
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/script \
-				${WRKSRC}/mkf/script \
-				${WRKSRC}/kiklib/script
-
-.if ${MACHINE_ARCH} == "vax" || ${MACHINE_ARCH} == "m88k"
-CONFIGURE_ENV+=	"X_EXTRA_LIBS=\"/usr/X11R6/lib/libXft.a \
-		/usr/X11R6/lib/libXfont.a \
-                /usr/X11R6/lib/libfontconfig.a /usr/X11R6/lib/libX11.a \
-                /usr/X11R6/lib/libfreetype.a /usr/X11R6/lib/libexpat.a \
-                /usr/X11R6/lib/libXrender.a /usr/X11R6/lib/libXext.a\""
-.endif
+CONFIGURE_ARGS=	--enable-anti-alias --enable-utmp \
+		--with-imagelib=gdk-pixbuf2 --with-type-engines=xft,xcore
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/freetype2" \
+		PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
 
 NO_REGRESS=	Yes
 

diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
@@ -1,6 +1,3 @@
-MD5 (mlterm-2.8.0.tar.gz) = 69b38c6909ba8cd2e81edd18fc612b1f
-MD5 (mlterm-2.8.0pl1.tar.gz) = 66a0d3b21e6bfcc7919b579794f70479
-RMD160 (mlterm-2.8.0.tar.gz) = f8448aa1a8d1a74bf3d6ee5638a00386783bcb54
-RMD160 (mlterm-2.8.0pl1.tar.gz) = 8e7d960ab6c181a08761c9925c9f2594994892be
-SHA1 (mlterm-2.8.0.tar.gz) = d32ef91e35ccf31f61332250076ad3e4a555d83f
-SHA1 (mlterm-2.8.0pl1.tar.gz) = 889b5f0747e895276589414cf26d3ef1df7c31c0
+MD5 (mlterm-2.9.0.tar.gz) = fb0c077b4ac1a2cf7ca455dc79b6cf6a
+RMD160 (mlterm-2.9.0.tar.gz) = 24b1c06a857a0309d1eaddbed60b2bbcf5ea1e90
+SHA1 (mlterm-2.9.0.tar.gz) = cbc72b653a96111fecb00344b0f48b70978d8010
diff --git a/x11/mlterm/patches/patch-kiklib_configure b/x11/mlterm/patches/patch-kiklib_configure
diff --git a/x11/mlterm/patches/patch-script_ltmain_sh b/x11/mlterm/patches/patch-script_ltmain_sh
@@ -0,0 +1,12 @@
+$OpenBSD: patch-script_ltmain_sh,v 1.1 2004/12/06 22:14:42 naddy Exp $
+--- script/ltmain.sh.orig	Mon Dec  6 22:59:42 2004
++++ script/ltmain.sh	Mon Dec  6 23:00:23 2004
+@@ -1758,7 +1758,7 @@ compiler."
+
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+-	    need_relink=yes
++	    need_relink=no
+ 	  fi
+
+ 	  if test -n "$old_archive_from_expsyms_cmds"; then
diff --git a/x11/mlterm/patches/patch-xwindow_x_xic_c b/x11/mlterm/patches/patch-xwindow_x_xic_c
diff --git a/x11/mlterm/pkg/PFRAG.shared b/x11/mlterm/pkg/PFRAG.shared
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 19:26:30 espie Exp $
-@lib lib/libkik.so.9.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/12/06 22:14:42 naddy Exp $
+@lib lib/libkik.so.10.0
 @lib lib/libmkf.so.13.0
+lib/mlterm/libim-kbd.so
 lib/mlterm/libathena.so
 lib/mlterm/libmotif.so
 lib/mlterm/libmozmodern.so

diff --git a/x11/mlterm/pkg/PLIST b/x11/mlterm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:30 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/12/06 22:14:42 naddy Exp $
 bin/mlcc
 bin/mlclient
 bin/mlterm
@@ -9,6 +9,8 @@ bin/mlterm
 lib/mlterm/
 @comment lib/mlterm/libathena.a
 @comment lib/mlterm/libathena.la
+@comment lib/mlterm/libim-kbd.a
+@comment lib/mlterm/libim-kbd.la
 @comment lib/mlterm/libmotif.a
 @comment lib/mlterm/libmotif.la
 @comment lib/mlterm/libmozmodern.a
@@ -37,14 +39,7 @@ share/examples/mlterm/tfont
 share/examples/mlterm/vaafont
 share/examples/mlterm/vfont
 share/examples/mlterm/xim
-share/locale/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/mlconfig.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/mlconfig.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
 share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
 %%SHARED%%