pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/tre For consistency's sake, remove PLIST.linux a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ea3a88ffa9e
branches:  trunk
changeset: 536446:7ea3a88ffa9e
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Dec 14 08:34:42 2007 +0000

description:
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.

diffstat:

 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(-)

diffs (75 lines):

diff -r 6e54e7370264 -r 7ea3a88ffa9e devel/tre/Makefile
--- a/devel/tre/Makefile        Fri Dec 14 08:27:39 2007 +0000
+++ b/devel/tre/Makefile        Fri Dec 14 08:34:42 2007 +0000
@@ -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 @@
 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 -r 6e54e7370264 -r 7ea3a88ffa9e devel/tre/PLIST
--- a/devel/tre/PLIST   Fri Dec 14 08:27:39 2007 +0000
+++ b/devel/tre/PLIST   Fri Dec 14 08:34:42 2007 +0000
@@ -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 -r 6e54e7370264 -r 7ea3a88ffa9e devel/tre/PLIST.Linux
--- a/devel/tre/PLIST.Linux     Fri Dec 14 08:27:39 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e54e7370264 -r 7ea3a88ffa9e devel/tre/PLIST.nls
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/tre/PLIST.nls       Fri Dec 14 08:34:42 2007 +0000
@@ -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 -r 6e54e7370264 -r 7ea3a88ffa9e devel/tre/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/tre/options.mk      Fri Dec 14 08:34:42 2007 +0000
@@ -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



Home | Main Index | Thread Index | Old Index