Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Aug 2014 16:01:09 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364452 - head/japanese/mecab
Message-ID:  <53e645c5.2ccc.3027e4fd@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Aug  9 16:01:09 2014
New Revision: 364452
URL: http://svnweb.freebsd.org/changeset/ports/364452
QAT: https://qat.redports.org/buildarchive/r364452/

Log:
  - Replace libtool BUILD_DEPENDS with USE_AUTOTOOLS=libtoolize
  - Replace STRIP_CMD with INSTALL_TARGET=install-strip
  - Remove PTHREAD_CFLAGS and PTHREAD_LIBS
  - Add --copy --force to AUTOMAKE_ARGS so all existing scripts are updated

Modified:
  head/japanese/mecab/Makefile

Modified: head/japanese/mecab/Makefile
==============================================================================
--- head/japanese/mecab/Makefile	Sat Aug  9 15:54:11 2014	(r364451)
+++ head/japanese/mecab/Makefile	Sat Aug  9 16:01:09 2014	(r364452)
@@ -13,26 +13,24 @@ COMMENT=	Yet Another Part-of-Speech and 
 LICENSE=	BSD3CLAUSE GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/libtool.m4:${PORTSDIR}/devel/libtool
-USE_AUTOTOOLS=	autoconf autoheader automake aclocal
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	ac_cv_lib_stdcpp_main=no
+INSTALL_TARGET=	install-strip
 USES=		iconv gettext:build libtool perl5
+USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtoolize
+AUTOMAKE_ARGS=	--add-missing --copy --force
 USE_PERL5=	build
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	ac_cv_lib_stdcpp_main=no
-
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I ${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
-AUTOMAKE_ARGS=	--add-missing
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
-			 -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}.in
+	${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}.in
 	${REINPLACE_CMD} -e 's/conf_DATA = mecabrc/conf_DATA = mecabrc.dist/' ${WRKSRC}/Makefile.am
 
 post-configure:
@@ -45,6 +43,5 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmecab.so
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e645c5.2ccc.3027e4fd>