ports/149391: fix for port: x11/mlterm

[Timothy Beyer]

>Number:         149391
>Category:       ports
>Synopsis:       fix for port: x11/mlterm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 07 09:50:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Timothy Beyer
>Release:        FreeBSD 8.0-RELEASE-p2 i386
>Organization:
no organization
>Environment:
System: FreeBSD aeonserv.aeonnet 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Fri Jan 29 18:00:42 PST 2010 beyert at aeonserv.aeonnet:/usr/src/sys/i386/compile/CUSTOM i386

>Description:
This patch prevents the following error from happening on my machine during compilation:


/usr/bin/ld: cannot find -lutempter
*** Error code 1

Stop in /usr/ports/x11/mlterm/work/mlterm-3.0.1/kiklib/src.

In this problem report is a patch to the Makefile that turns off libtool and the CONFIGURE_ENV line, which fixed the build problem on my system.  It also has two fewer warnings from portlint than the previous Makefile.  I attempted to preserve as much of the previous design as possible, but I do not know if it preserves all of the features desired by the maintainer, particularly on 9-CURRENT.

Also, this patch defaults to using --with-imagelib-gdk-pixbuf2 instead of --with-imagelib-gdk-pixbuf, and adds the --enable-optimize-redrawing switch.  I think these are probably beneficial.

>How-To-Repeat:
    Apply the patch
>Fix:
    The included patch,

--- Makefile.diff begins here ---
--- Makefile.orig	2010-07-17 22:33:10.000000000 -0700
+++ Makefile	2010-08-07 01:42:58.000000000 -0700
@@ -15,16 +15,15 @@
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
+HAS_CONFIGURE=	yes
 USE_XORG=	sm
 USE_GNOME=	gtk20 lthack
-USE_AUTOTOOLS=	libtool:22
-LIBTOOLFILES=	configure kiklib/configure mkf/configure
 USE_PERL5_BUILD=yes
 USE_GETTEXT=	yes
-CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf --enable-utmp \
+CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf2 --enable-utmp \
+		--mandir="${LOCALBASE}/man" --enable-optimize-redrawing \
 		--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig" \
 		--with-type-engines="xcore,xft"
-CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/iiim"
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS=	FRIBIDI	"Use Fribidi for BiDi rendering" off \
 		UIM "uim support (experimental)" off \
@@ -94,7 +93,6 @@
 		${WRKSRC}/kiklib/configure ${WRKSRC}/mkf/configure
 
 post-configure:
-	@${CP} ${LIBTOOL} ${WRKSRC}
 	@${REINPLACE_CMD} -e "s, at CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \
 		${WRKSRC}/tool/w3mmlconfig/mlconfig.cgi
 .if ${OSVERSION} >= 900004
--- Makefile.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: