ports/113441: [PATCH] update textproc/libtre to 0.7.5

[bf]

>Number:         113441
>Category:       ports
>Synopsis:       [PATCH] update textproc/libtre to 0.7.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 07 06:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        6.2-Stable i386
>Organization:
-
>Environment:
>Description:
diff -ruN libtre.orig/Makefile libtre/Makefile
--- libtre.orig/Makefile	Sat May 19 21:07:06 2007
+++ libtre/Makefile	Thu Jun  7 02:06:40 2007
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libtre
-PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTVERSION=	0.7.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://laurikari.net/tre/ \
 		${MASTER_SITE_LOCAL}
@@ -22,22 +21,29 @@
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_GETOPT_LONG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		agrep.1
+MANCOMPRESSED=	no
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+OPTIONS=	NLS "native language support" off \
+		OPTIMIZED_CFLAGS "append optimization flags to CFLAGS" off \
+		STATIC "build both static and shared libraries" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
@@ -46,23 +52,19 @@
 		-fforce-mem -fforce-addr -O3
 .endif
 
-pre-everything::
-.ifndef(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS'
-	@${ECHO_MSG} "===> For example, 'make WITH_OPTIMIZED_CFLAGS=yes'"
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=	--enable-static
+PLIST_SUB+=	STATIC=""
+.else
+PLIST_SUB+=	STATIC="@comment "
 .endif
-	@${ECHO_MSG} '===>'
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in tre-api.html tre-syntax.html
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN libtre.orig/distinfo libtre/distinfo
--- libtre.orig/distinfo	Mon May 22 05:55:44 2006
+++ libtre/distinfo	Thu Jun  7 00:19:26 2007
@@ -1,3 +1,3 @@
-MD5 (tre-0.7.4.tar.bz2) = 8b4bfb078f2cc9e01f37d3d251672f75
-SHA256 (tre-0.7.4.tar.bz2) = 0d55b4bc0a9594c433f2657de9bf4610a1553776f42d317a065929d1c4e91f66
-SIZE (tre-0.7.4.tar.bz2) = 387358
+MD5 (tre-0.7.5.tar.bz2) = e72e5c94008865cf720992a0b25d6e89
+SHA256 (tre-0.7.5.tar.bz2) = 030f25e6e4c1714df013105494bc5e24b3e0acc65887158a52a03efd8e0759aa
+SIZE (tre-0.7.5.tar.bz2) = 396346
diff -ruN libtre.orig/pkg-plist libtre/pkg-plist
--- libtre.orig/pkg-plist	Sat May 19 21:07:06 2007
+++ libtre/pkg-plist	Thu Jun  7 01:24:47 2007
@@ -1,14 +1,14 @@
- at comment $FreeBSD: ports/textproc/libtre/pkg-plist,v 1.11 2007/05/19 20:24:02 flz Exp $
 bin/agrep
 include/tre/regex.h
 include/tre/tre-config.h
-lib/libtre.a
+%%STATIC%%lib/libtre.a
 lib/libtre.la
 lib/libtre.so
 lib/libtre.so.6
 libdata/pkgconfig/tre.pc
 %%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
- at dirrm include/tre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm include/tre

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
>Unformatted: