[149060] trunk/dports/science/funtools
aronnax at macports.org
aronnax at macports.org
Fri May 27 07:02:24 PDT 2016
Revision: 149060
https://trac.macports.org/changeset/149060
Author: aronnax at macports.org
Date: 2016-05-27 07:02:24 -0700 (Fri, 27 May 2016)
Log Message:
-----------
funtools: update to 1.4.6
Modified Paths:
--------------
trunk/dports/science/funtools/Portfile
Added Paths:
-----------
trunk/dports/science/funtools/files/patch-util_Makefile.in.diff
Removed Paths:
-------------
trunk/dports/science/funtools/files/patch-funtools
Modified: trunk/dports/science/funtools/Portfile
===================================================================
--- trunk/dports/science/funtools/Portfile 2016-05-27 13:47:27 UTC (rev 149059)
+++ trunk/dports/science/funtools/Portfile 2016-05-27 14:02:24 UTC (rev 149060)
@@ -2,9 +2,9 @@
# $Id$
PortSystem 1.0
+PortGroup github 1.0
-name funtools
-version 1.4.4
+github.setup ericmandel funtools 1.4.6 v
categories science
platforms darwin
maintainers aronnax openmaintainer
@@ -26,19 +26,15 @@
coders. In this case, minimal buy-in means easy to learn, easy to \
use, and easy to re-learn next month.
-homepage http://www.cfa.harvard.edu/~john/funtools/
-master_sites ${homepage}
+checksums rmd160 eff2df467ac36deb1e379e5a20ca316aaab96bc2 \
+ sha256 2e7c03b2a573f62e77ca53b7ced35fb1094a1a7da99f2386258cc1d0c4c4b4a8
-checksums rmd160 26f4a7395045f25c70286cbc5b384666470c8d3a \
- sha256 f47a00e774b557931a7ff00ddd0852e32ae5d2a2f0d3a227f8ba81d3db1e863b
+# Rename 'gcat' to 'fungcat' to avoid collision with binary of same name
+# provided by port coreutils
+patchfiles patch-util_Makefile.in.diff
-depends_run port:xpa
+use_autoreconf yes
-patch.pre_args -p1
-patchfiles patch-funtools
-
-use_parallel_build no
-
destroot.destdir INSTALL_ROOT=${destroot}
post-destroot {
@@ -52,7 +48,3 @@
funtools.pdf \
${docdir}
}
-
-livecheck.type regex
-livecheck.url [lindex ${master_sites} 0]
-livecheck.regex ${name}-(\[0-9.\]+)\\.tar
Deleted: trunk/dports/science/funtools/files/patch-funtools
===================================================================
--- trunk/dports/science/funtools/files/patch-funtools 2016-05-27 13:47:27 UTC (rev 149059)
+++ trunk/dports/science/funtools/files/patch-funtools 2016-05-27 14:02:24 UTC (rev 149060)
@@ -1,103 +0,0 @@
-diff -Naur funtools-1.4.0.orig/Makefile.in funtools-1.4.0/Makefile.in
---- funtools-1.4.0.orig/Makefile.in 2007-05-03 03:17:58.000000000 +0200
-+++ funtools-1.4.0/Makefile.in 2009-12-23 17:01:56.000000000 +0200
-@@ -43,10 +43,10 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the funtools.h include file:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # Top-level directory for manual entries:
--MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/man
-
- # Top-level directory for share entries:
- MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools
-diff -Naur funtools-1.4.0.orig/filter/Makefile.in funtools-1.4.0/filter/Makefile.in
---- funtools-1.4.0.orig/filter/Makefile.in 2006-03-20 20:42:11.000000000 +0200
-+++ funtools-1.4.0/filter/Makefile.in 2009-12-23 17:01:56.000000000 +0200
-@@ -44,7 +44,7 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the include files:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # util files are in the util directory at same level
- UTIL_INC = -I../util
-diff -Naur funtools-1.4.0.orig/fitsy/Makefile.in funtools-1.4.0/fitsy/Makefile.in
---- funtools-1.4.0.orig/fitsy/Makefile.in 2006-10-30 18:51:58.000000000 +0200
-+++ funtools-1.4.0/fitsy/Makefile.in 2009-12-23 17:01:56.000000000 +0200
-@@ -43,7 +43,7 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the include files:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # There are just too many different versions of "install" around;
- # better to use the install-sh script that comes with the distribution,
-diff -Naur funtools-1.4.0.orig/gnu/Makefile.in funtools-1.4.0/gnu/Makefile.in
---- funtools-1.4.0.orig/gnu/Makefile.in 2003-11-25 16:35:24.000000000 +0200
-+++ funtools-1.4.0/gnu/Makefile.in 2009-12-23 17:01:56.000000000 +0200
-@@ -59,7 +59,7 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the include files:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # There are just too many different versions of "install" around;
- # better to use the install-sh script that comes with the distribution,
---- funtools-1.4.0.orig/wcs/Makefile.in 2006-11-30 20:46:29.000000000 +0200
-+++ funtools-1.4.0/wcs/Makefile.in 2009-12-23 17:01:56.000000000 +0200
-@@ -43,7 +43,7 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the include file wcs.h:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
---- funtools-1.4.4/util/Makefile.in.orig 2009-03-30 05:59:34.000000000 -0700
-+++ funtools-1.4.4/util/Makefile.in 2014-07-14 10:08:51.000000000 -0700
-@@ -44,7 +44,7 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the include files:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # extra includes for compiling
- INCLUDES =
-@@ -129,7 +129,7 @@
-
- TESTPROGS = tparse tlaunch tlaunch2
-
--PROGS = gcat
-+PROGS = fungcat
-
- all: $(LIB) $(PROGS)
-
-@@ -180,8 +180,8 @@
-
- gcat.o: gcat.c gio.h
-
--gcat: gcat.o $(LIB)
-- $(CC) $(LDFLAGS) gcat.o -o gcat $(LIB) $(LIBS) $(EXTRA_LIBS)
-+fungcat: gcat.o $(LIB)
-+ $(CC) $(LDFLAGS) gcat.o -o fungcat $(LIB) $(LIBS) $(EXTRA_LIBS)
-
- tparse.o: tparse.c
-
-@@ -230,7 +230,7 @@
- fi; \
- done;
- @for i in NaN.h conf.h file.h find.h gio.h xlaunch.h longlong.h \
-- macro.h mainlib.h tclmainlib.h mkrtemp.h parse.h prsetup.h \
-+ macro.h mainlib.h tclmainlib.h mkrtemp.h parse.h \
- xalloc.h strtod.h swap.h word.h xport.h winprocess.h xfileio.h \
- zprocess.h; \
- do \
Added: trunk/dports/science/funtools/files/patch-util_Makefile.in.diff
===================================================================
--- trunk/dports/science/funtools/files/patch-util_Makefile.in.diff (rev 0)
+++ trunk/dports/science/funtools/files/patch-util_Makefile.in.diff 2016-05-27 14:02:24 UTC (rev 149060)
@@ -0,0 +1,22 @@
+--- util/Makefile.in.orig 2016-05-27 09:55:40.000000000 -0400
++++ util/Makefile.in 2016-05-27 09:56:20.000000000 -0400
+@@ -129,7 +129,7 @@
+
+ TESTPROGS = tparse tlaunch tlaunch2
+
+-PROGS = gcat
++PROGS = fungcat
+
+ all: $(LIB) $(PROGS)
+
+@@ -180,8 +180,8 @@
+
+ gcat.o: gcat.c gio.h
+
+-gcat: gcat.o $(LIB)
+- $(CC) $(LDFLAGS) gcat.o -o gcat $(LIB) $(LIBS) $(EXTRA_LIBS)
++fungcat: gcat.o $(LIB)
++ $(CC) $(LDFLAGS) gcat.o -o fungcat $(LIB) $(LIBS) $(EXTRA_LIBS)
+
+ tparse.o: tparse.c
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160527/730c0f06/attachment.html>
More information about the macports-changes
mailing list