[61233] trunk/dports/textproc/msort
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 5 21:57:26 PST 2009
Revision: 61233
http://trac.macports.org/changeset/61233
Author: ryandesign at macports.org
Date: 2009-12-05 21:57:23 -0800 (Sat, 05 Dec 2009)
Log Message:
-----------
msort: update to 8.52, fix incompatibility with tre 0.8.0, also install documentation files, add license info
Modified Paths:
--------------
trunk/dports/textproc/msort/Portfile
Added Paths:
-----------
trunk/dports/textproc/msort/files/
trunk/dports/textproc/msort/files/patch-CFLAGS.diff
trunk/dports/textproc/msort/files/patch-tre-0.8.diff
Modified: trunk/dports/textproc/msort/Portfile
===================================================================
--- trunk/dports/textproc/msort/Portfile 2009-12-06 03:54:05 UTC (rev 61232)
+++ trunk/dports/textproc/msort/Portfile 2009-12-06 05:57:23 UTC (rev 61233)
@@ -3,22 +3,43 @@
PortSystem 1.0
name msort
-version 8.45
+version 8.52
categories textproc
platforms darwin
maintainers nomaintainer
+license GPLv3
description program for sorting files in sophisticated ways
long_description Msort is a program for sorting files in sophisticated \
ways. Records need not be single lines.
homepage http://billposer.org/Software/msort.html
master_sites http://www.billposer.org/Software/Downloads/
-checksums sha1 03e0390da91a0c3242da7d36cb21285906663066
+checksums md5 b5f07461b8f587df67494da0fe83e383 \
+ sha1 9ca7b85920cbc3af186a1899345183b0bdf4a39f \
+ rmd160 272c49af9f761de4584ff1c512d6a6597d69617d
use_bzip2 yes
depends_lib port:tre port:gettext port:libuninum port:libutf8proc
-depends_run port:tcl port:tk
+depends_run port:tcl port:tk port:iwidgets
+patchfiles patch-tre-0.8.diff \
+ patch-CFLAGS.diff
+
+use_autoreconf yes
+
configure.args --mandir=${prefix}/share/man
configure.ldflags-append "-lintl"
+post-destroot {
+ xinstall -d ${destroot}${prefix}/share/doc
+ copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}
+ xinstall -m 644 -W ${worksrcpath} \
+ AUTHORS \
+ COPYING \
+ CREDITS \
+ ChangeLog \
+ NEWS \
+ README \
+ TODO \
+ ${destroot}${prefix}/share/doc/${name}
+}
Added: trunk/dports/textproc/msort/files/patch-CFLAGS.diff
===================================================================
--- trunk/dports/textproc/msort/files/patch-CFLAGS.diff (rev 0)
+++ trunk/dports/textproc/msort/files/patch-CFLAGS.diff 2009-12-06 05:57:23 UTC (rev 61233)
@@ -0,0 +1,15 @@
+Append to CFLAGS; don't overwrite.
+--- configure.ac 2009-12-04 14:58:38.000000000 -0600
++++ configure.ac 2009-12-04 14:58:51.000000000 -0600
+@@ -77,9 +77,9 @@
+ # Checks for programs.
+ AC_PROG_CC
+ if ${debugbuild}; then
+- CFLAGS="-ggdb -g3"
++ CFLAGS+=" -ggdb -g3"
+ else
+- CFLAGS="-g -O2"
++ CFLAGS+=" -g -O2"
+ fi
+
+ AC_PROG_INSTALL
Added: trunk/dports/textproc/msort/files/patch-tre-0.8.diff
===================================================================
--- trunk/dports/textproc/msort/files/patch-tre-0.8.diff (rev 0)
+++ trunk/dports/textproc/msort/files/patch-tre-0.8.diff 2009-12-06 05:57:23 UTC (rev 61233)
@@ -0,0 +1,58 @@
+tre 0.8.0 added a "tre_" prefix to all function names
+--- configure.ac 2008-12-06 23:33:00.000000000 -0600
++++ configure.ac 2009-12-04 14:13:54.000000000 -0600
+@@ -85,7 +85,7 @@
+ AC_PROG_INSTALL
+
+ # Checks for libraries.
+-AC_CHECK_LIB([tre], [regwcomp],,[AC_MSG_ERROR([libtre not found. see http://laurikari.net/tre/])])
++AC_CHECK_LIB([tre], [tre_regwcomp],,[AC_MSG_ERROR([libtre not found. see http://laurikari.net/tre/])])
+ AC_CHECK_LIB([intl], [gettext],AC_DEFINE([HAVE_LIBINTL], [1],[Define to 1 if you have libintl.]),)
+ #AM_GNU_GETTEXT
+
+@@ -110,6 +110,6 @@
+ AC_C_PRINTF_THSEP
+
+ # Checks for library functions.
+-AC_CHECK_FUNCS([getopt_long malloc mbstowcs nl_langinfo realloc regwcomp regwexec setlocale strchr strrchr strtod strtol uninum_gmp_version wcschr wcscmp wcscasecmp wcsxfrm])
++AC_CHECK_FUNCS([getopt_long malloc mbstowcs nl_langinfo realloc tre_regwcomp tre_regwexec setlocale strchr strrchr strtod strtol uninum_gmp_version wcschr wcscmp wcscasecmp wcsxfrm])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+--- msort.c 2008-12-05 23:44:10.000000000 -0600
++++ msort.c 2009-12-04 14:15:51.000000000 -0600
+@@ -1046,7 +1046,7 @@
+ fprintf(stderr,_("EvalEscapes: out of memory.\n"));
+ exit(OUTOFMEMORY);
+ }
+- tmpint1 = regwcomp(&(KeyInfo[KeyCount]->cregexp),TagTemp,REG_EXTENDED);
++ tmpint1 = tre_regwcomp(&(KeyInfo[KeyCount]->cregexp),TagTemp,REG_EXTENDED);
+ if(tmpint1 != 0){
+ fprintf(stderr,_("Failed to compile regular expression: %s.\n"), optarg);
+ PrintLog( _("Failed to compile regular expression: %s.\n"), optarg);
+@@ -4009,7 +4009,7 @@
+ } else{
+ /* Key fields identified by tag */
+ for(j = 0;j < FieldCnt; j++){
+- stat = regwexec(&(info[i]->cregexp),FieldPtrs[j],CAPTURED_GROUPS,pm,0);
++ stat = tre_regwexec(&(info[i]->cregexp),FieldPtrs[j],CAPTURED_GROUPS,pm,0);
+ if(stat == 0) {
+ /* Check whether value is empty */
+ Key = FieldPtrs[j] + pm[1].rm_eo;
+@@ -4941,7 +4941,7 @@
+ fprintf(stderr,_("Out of memory.\n"));
+ exit(OUTOFMEMORY);
+ }
+- tmpint1 = regwcomp(&(new->cregexp),restr,REG_EXTENDED);
++ tmpint1 = tre_regwcomp(&(new->cregexp),restr,REG_EXTENDED);
+ if(tmpint1 != 0) return -1;
+ if(se == NULL) {
+ new->se = NULL;
+@@ -5085,7 +5085,7 @@
+ s = str;
+
+ while (*s != L'\0') {
+- if(regwexec(cre,s,2,pm,0) != 0) {
++ if(tre_regwexec(cre,s,2,pm,0) != 0) {
+ TotalChars += wcslen(s);
+ wcscat(new,s);
+ break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091205/487ebd50/attachment.html>
More information about the macports-changes
mailing list