From owner-svn-ports-head@FreeBSD.ORG Tue May 20 06:24:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18BA13F9; Tue, 20 May 2014 06:24:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDDEB217D; Tue, 20 May 2014 06:24:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4K6O0Jx082664; Tue, 20 May 2014 06:24:00 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4K6O0Io082661; Tue, 20 May 2014 06:24:00 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201405200624.s4K6O0Io082661@svn.freebsd.org> From: "Vanilla I. Shu" Date: Tue, 20 May 2014 06:24:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354599 - in head/chinese/libtabe: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 06:24:01 -0000 Author: vanilla Date: Tue May 20 06:24:00 2014 New Revision: 354599 URL: http://svnweb.freebsd.org/changeset/ports/354599 QAT: https://qat.redports.org/buildarchive/r354599/ Log: Add missing patch file on prev commit, and fix building. Submitted by: swills@ Added: head/chinese/libtabe/files/patch-src__supports__bims__Makefile.in (contents, props changed) Modified: head/chinese/libtabe/Makefile Modified: head/chinese/libtabe/Makefile ============================================================================== --- head/chinese/libtabe/Makefile Tue May 20 06:08:36 2014 (r354598) +++ head/chinese/libtabe/Makefile Tue May 20 06:24:00 2014 (r354599) @@ -3,16 +3,16 @@ PORTNAME= libtabe PORTVERSION= 0.2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/ MAINTAINER= clsung@FreeBSD.org COMMENT= Unified library for Chinese text processing +USES= gmake USE_LDCONFIG= yes GNU_CONFIGURE= yes -USES= gmake USE_BDB= yes OBSOLETE_BDB_VAR= USE_DB2 DATADIR= ${PREFIX}/share/tabe @@ -26,13 +26,16 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --enable-shared MAKE_JOBS_UNSAFE= yes -.include +OPTIONS_DEFINE= DOCS X11 +OPTIONS_DEFAULT= DOCS + +.include -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 PLIST_SUB+= X11="" .else -CONFIGURE_ARGS+=--without-x +CONFIGURE_ARGS+= --without-x PLIST_SUB+= X11="@comment " .endif @@ -49,7 +52,7 @@ pre-everything:: post-patch: ${REINPLACE_CMD} -e '/objformat/s/echo aout/echo elf/' ${WRKSRC}/configure -.if defined(WITHOUT_X11) +.if !${PORT_OPTIONS:MX11} ${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' ${WRKSRC}/src/Makefile.in .endif @@ -57,7 +60,7 @@ post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tsi-src/README ${STAGEDIR}${DOCSDIR}/README.tsi -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} ${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README ${STAGEDIR}${DOCSDIR}/README.bims .endif .for DOC in BoPoMoFo.shtml Changes Changes.pre-0.1 TODO ZuYinCode.txt \ @@ -66,4 +69,4 @@ post-install: .endfor .endif -.include +.include Added: head/chinese/libtabe/files/patch-src__supports__bims__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/libtabe/files/patch-src__supports__bims__Makefile.in Tue May 20 06:24:00 2014 (r354599) @@ -0,0 +1,14 @@ +--- ./src/supports/bims/Makefile.in.orig 2014-05-19 15:27:54.010122398 +0800 ++++ ./src/supports/bims/Makefile.in 2014-05-19 15:28:23.998115848 +0800 +@@ -59,7 +59,7 @@ + $(RM) Makefile + + install: all +- if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi +- if [ ! -d $(includedir) ]; then $(INSTALL) -d $(includedir); fi +- $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(libdir) +- $(INSTALL_DATA) $(INCLUDES) $(includedir) ++ if [ ! -d $(DESTDIR)$(libdir) ]; then $(INSTALL) -d $(DESTDIR)$(libdir); fi ++ if [ ! -d $(DESTDIR)$(includedir) ]; then $(INSTALL) -d $(DESTDIR)$(includedir); fi ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(DESTDIR)$(libdir) ++ $(INSTALL_DATA) $(INCLUDES) $(DESTDIR)$(includedir)