From 407703930992b5c0717bd5e3349f396136252ec0 Mon Sep 17 00:00:00 2001 From: bjs Date: Fri, 14 Dec 2007 08:34:42 +0000 Subject: For consistency's sake, remove PLIST.linux and instead add an option to enable/disable NLS. This option is added to PKG_SUPPORTED_OPTIONS by default if there is a built-in gettext library. While here, add PKG_DESTDIR_SUPPORT=user-destdir. Bump revision. --- devel/tre/Makefile | 8 ++++++-- devel/tre/PLIST | 2 +- devel/tre/PLIST.Linux | 3 --- devel/tre/PLIST.nls | 3 +++ devel/tre/options.mk | 20 ++++++++++++++++++++ 5 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 devel/tre/PLIST.Linux create mode 100644 devel/tre/PLIST.nls create mode 100644 devel/tre/options.mk (limited to 'devel/tre') diff --git a/devel/tre/Makefile b/devel/tre/Makefile index 418a3348ade..8c549cf5374 100644 --- a/devel/tre/Makefile +++ b/devel/tre/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2007/10/13 10:52:30 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2007/12/14 08:34:42 bjs Exp $ DISTNAME= tre-0.7.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= http://laurikari.net/tre/ @@ -9,10 +9,14 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://laurikari.net/tre/ COMMENT= Lightweight and robust POSIX compliant regexp matching library +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_LIBTOOL= YES CONFIGURE_ARGS+= --disable-agrep CONFIGURE_ARGS+= --disable-system-abi +.include "options.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/devel/tre/PLIST b/devel/tre/PLIST index 514d3b9348f..d00e7a83009 100644 --- a/devel/tre/PLIST +++ b/devel/tre/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/29 19:12:04 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/12/14 08:34:43 bjs Exp $ include/tre/regex.h include/tre/tre-config.h lib/libtre.la diff --git a/devel/tre/PLIST.Linux b/devel/tre/PLIST.Linux deleted file mode 100644 index 7a445c6e12d..00000000000 --- a/devel/tre/PLIST.Linux +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.Linux,v 1.1 2007/10/13 10:52:30 adrianp Exp $ -share/locale/fi/LC_MESSAGES/tre.mo -share/locale/sv/LC_MESSAGES/tre.mo diff --git a/devel/tre/PLIST.nls b/devel/tre/PLIST.nls new file mode 100644 index 00000000000..974e1cba2e6 --- /dev/null +++ b/devel/tre/PLIST.nls @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST.nls,v 1.1 2007/12/14 08:34:44 bjs Exp $ +share/locale/fi/LC_MESSAGES/tre.mo +share/locale/sv/LC_MESSAGES/tre.mo diff --git a/devel/tre/options.mk b/devel/tre/options.mk new file mode 100644 index 00000000000..3d9c277a25e --- /dev/null +++ b/devel/tre/options.mk @@ -0,0 +1,20 @@ +PKG_OPTIONS_VAR= PKG_OPTIONS.tre +PKG_SUPPORTED_OPTIONS= nls + +CHECK_BUILTIN.gettext:= yes +.include "../../devel/gettext-lib/builtin.mk" +CHECK_BUILTIN.gettext:= no + +.if !empty(USE_BUILTIN.gettext:tl:Myes) +PKG_SUGGESTED_OPTIONS= nls +.endif + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mnls) +PLIST_SRC+= PLIST.nls +USE_PKGLOCALEDIR= yes +. include "../../devel/gettext-lib/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-nls +.endif -- cgit v1.2.3