[Midnightbsd-cvs] mports [18346] trunk/textproc/libtre: fix build

[laffer1 at midnightbsd.org]

Revision: 18346
          http://svnweb.midnightbsd.org/mports/?rev=18346
Author:   laffer1
Date:     2015-03-26 22:02:36 -0400 (Thu, 26 Mar 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/textproc/libtre/Makefile
    trunk/textproc/libtre/pkg-plist

Modified: trunk/textproc/libtre/Makefile
===================================================================
--- trunk/textproc/libtre/Makefile	2015-03-27 01:58:27 UTC (rev 18345)
+++ trunk/textproc/libtre/Makefile	2015-03-27 02:02:36 UTC (rev 18346)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libtre
 PORTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://laurikari.net/tre/ \
 		LOCAL/bf
@@ -9,13 +9,14 @@
 DISTNAME=	tre-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A lightweight fully POSIX compliant regexp matching library
+COMMENT=	Lightweight fully POSIX compliant regexp matching library
 
 LICENSE=	bsd2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		pkgconfig libtool tar:bzip2
-USE_GNOME=	gnomehack
-CONFIGURE_ARGS+=	--enable-static
+USES=		libtool pathfix pkgconfig tar:bzip2
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-static
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -22,33 +23,18 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS OPTIMIZED_CFLAGS PGO DOCS
-PGO_DESC=	Enable Profile-Guided Optimization
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+OPTIMIZED_CFLAGS_CFLAGS= \
+		-Wuninitialized -ffast-math -finline-functions \
+		-fomit-frame-pointer -fexpensive-optimizations -O3
+PGO_CFLAGS=	-fprofile-generate
+PGO_LDFLAGS=	-fprofile-generate
 
-MAN1=	tre_agrep.1
-
-.include <bsd.port.pre.mk>
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-Wuninitialized -ffast-math -finline-functions \
-		-fomit-frame-pointer -fexpensive-optimizations \
-		-fforce-mem -fforce-addr -O3
-.endif
-
-.if ${PORT_OPTIONS:MPGO}
-LDFLAGS+=	-fprofile-generate
-CFLAGS+=	-fprofile-generate
-.endif
-
-post-patch:
+post-patch: .SILENT
 	${MV} ${WRKSRC}/doc/agrep.1.in ${WRKSRC}/doc/tre_agrep.1.in
 	${REINPLACE_CMD} -e 's;agrep\.1;tre_agrep\.1;g' ${WRKSRC}/configure \
 	${WRKSRC}/tre.spec.in ${WRKSRC}/doc/Makefile.in
@@ -55,22 +41,17 @@
 	${REINPLACE_CMD} -e 's;agrep;tre_agrep;g' ${WRKSRC}/tests/agrep/*.ok
 
 .if ${PORT_OPTIONS:MPGO}
-.if target(pre-build)
-.error Makefile error since pre-build target has already been defined
-.endif
 pre-build: pgo
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in tre-api.html tre-syntax.html
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
-.endif
 
 regression-test: build
-	@(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} check )
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check )
 
 .if ${PORT_OPTIONS:MPGO}
 pgo: pgo-pre-build pgo-build pgo-run pgo-post-run pgo-clean
@@ -88,7 +69,7 @@
 
 pgo-run:
 # Check everything to generate profiling information.
-	@-(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} check)
+	@-(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
 
 pgo-post-run:
 	@${FIND} ${BUILD_WRKSRC} -type f -name Makefile -exec \
@@ -108,7 +89,7 @@
 pgo-clean:
 # Selectively clean some directories.
 . for dir in src tests
-	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} clean)
+	@(cd ${BUILD_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} clean)
 . endfor
 # Only remove some files from lib to preserve profiling information.
 	@${FIND} -E ${BUILD_WRKSRC}/lib -iregex ".*\.(a|la|lai|lo|o|so|so\..*)$$" \
@@ -115,4 +96,4 @@
 		-exec ${RM} -f {} \;
 .endif # if ${PORT_OPTIONS:MPGO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/textproc/libtre/pkg-plist
===================================================================
--- trunk/textproc/libtre/pkg-plist	2015-03-27 01:58:27 UTC (rev 18345)
+++ trunk/textproc/libtre/pkg-plist	2015-03-27 02:02:36 UTC (rev 18346)
@@ -5,10 +5,10 @@
 lib/libtre.a
 lib/libtre.so
 lib/libtre.so.5
+lib/libtre.so.5.0.0
 libdata/pkgconfig/tre.pc
+man/man1/tre_agrep.1.gz
 %%NLS%%share/locale/fi/LC_MESSAGES/tre.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/tre.mo
 %%PORTDOCS%%%%DOCSDIR%%/tre-api.html
 %%PORTDOCS%%%%DOCSDIR%%/tre-syntax.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm include/tre