[134873] trunk/dports/devel/cvs-fast-export

[mojca at macports.org]

Revision: 134873
          https://trac.macports.org/changeset/134873
Author:   mojca at macports.org
Date:     2015-04-09 04:34:40 -0700 (Thu, 09 Apr 2015)
Log Message:
-----------
cvs-fast-export: upgrade to version 1.30

Modified Paths:
--------------
    trunk/dports/devel/cvs-fast-export/Portfile
    trunk/dports/devel/cvs-fast-export/files/patch-Makefile.diff

Modified: trunk/dports/devel/cvs-fast-export/Portfile
===================================================================
--- trunk/dports/devel/cvs-fast-export/Portfile	2015-04-09 11:23:57 UTC (rev 134872)
+++ trunk/dports/devel/cvs-fast-export/Portfile	2015-04-09 11:34:40 UTC (rev 134873)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                cvs-fast-export
-version             1.8
+version             1.30
 categories          devel
 license             GPL-2
 platforms           darwin
@@ -25,8 +25,8 @@
 homepage            http://www.catb.org/~esr/cvs-fast-export/
 master_sites        ${homepage}
 
-checksums           rmd160  7d7b80551f00837c0db37ca82a5092fde039ebcf \
-                    sha256  046b4bdd3e715dd3bb5d75004da0bfc9f2f9d63122952281c2b9cd413be6571d
+checksums           rmd160  56dd5ccc0e0c9b08d469b496fe2dd817e205d2ac \
+                    sha256  9957ecf0486b2d83e37cb47a8d4af1ffbf3d5e59d8ab978e5ca197ad49bd01f7
 
 depends_build       port:flex \
                     port:bison \

Modified: trunk/dports/devel/cvs-fast-export/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/cvs-fast-export/files/patch-Makefile.diff	2015-04-09 11:23:57 UTC (rev 134872)
+++ trunk/dports/devel/cvs-fast-export/files/patch-Makefile.diff	2015-04-09 11:34:40 UTC (rev 134873)
@@ -1,55 +1,61 @@
 --- Makefile.orig
 +++ Makefile
-@@ -4,9 +4,11 @@
- # For blob compression you will also need zlib.
+@@ -9,21 +9,25 @@
+ VERSION=1.30
  
- INSTALL = install
+ .PATH: $(.PARSEDIR)
 -prefix?=/usr/local
 +prefix?=@@PREFIX@@
  target=$(DESTDIR)$(prefix)
--LEX=/usr/bin/flex
-+LEX=@@FLEX@@
+ parsedir:=$(.PARSEDIR)
+ srcdir=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))$(parsedir)
+ VPATH=$(srcdir)
+ 
++FLEX=@@FLEX@@
 +CC=@@CC@@
 +A2X=@@A2X@@
++
+ INSTALL = install
  
- VERSION=1.8
- 
-@@ -14,7 +16,7 @@ GCC_WARNINGS1=-Wall -Wpointer-arith -Wstrict-prototypes
+ GCC_WARNINGS1=-Wall -Wpointer-arith -Wstrict-prototypes
  GCC_WARNINGS2=-Wmissing-prototypes -Wmissing-declarations
  GCC_WARNINGS3=-Wno-unused-function -Wno-unused-label -Wno-format-zero-length
  GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3)
--CFLAGS=$(GCC_WARNINGS) -DVERSION=\"$(VERSION)\"
-+CFLAGS+=$(GCC_WARNINGS) -DVERSION=\"$(VERSION)\"
+-CFLAGS=$(GCC_WARNINGS)
++CFLAGS+=$(GCC_WARNINGS)
+ CPPFLAGS += -I. -I$(srcdir)
+-LIBS=-lrt
++#LIBS=-lrt
+ CPPFLAGS += -DVERSION=\"$(VERSION)\"
  
- # To enable debugging of the Yacc grammar, uncomment the following line
- #CFLAGS += -DYYDEBUG=1
-@@ -36,7 +38,7 @@ OBJS=gram.o lex.o rbtree.o main.o cvsutil.o revdir.o \
- 	nodehash.o tags.o authormap.o graph.o utils.o
+ # Enable this for multithreading.
+@@ -92,7 +96,7 @@ BISON ?= bison
+ gram.h gram.c: gram.y
+ 	$(BISON)  $(YFLAGS) --defines=gram.h --output-file=gram.c $(srcdir)/gram.y
+ lex.h lex.c: lex.l
+-	flex $(LFLAGS) --header-file=lex.h --outfile=lex.c $(srcdir)/lex.l
++	$(FLEX) $(LFLAGS) --header-file=lex.h --outfile=lex.c $(srcdir)/lex.l
  
- cvs-fast-export: $(OBJS)
--	cc $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+ gram.o: gram.c lex.h gram.h
+ import.o: import.c lex.h gram.h
+@@ -102,9 +106,9 @@ lex.o: lex.c gram.h
  
- $(OBJS): cvs.h
- 
-@@ -55,9 +57,9 @@ y.tab.h: gram.c
- 
- # Requires asciidoc
+ # Requires asciidoc and xsltproc/docbook stylesheets.
  .asc.1:
--	a2x --doctype manpage --format manpage $*.asc
-+	$(A2X) --doctype manpage --format manpage $*.asc
+-	a2x --doctype manpage --format manpage -D . $<
++	$(A2X) --doctype manpage --format manpage -D . $<
  .asc.html:
--	a2x --doctype manpage --format xhtml $*.asc
-+	$(A2X) --doctype manpage --format xhtml $*.asc
+-	a2x --doctype manpage --format xhtml -D . $<
++	$(A2X) --doctype manpage --format xhtml -D . $<
+ 	rm -f docbook-xsl.css
  
- man: cvssync.1 cvs-fast-export.1
- 
-@@ -90,7 +92,7 @@ SUPPRESSIONS = -U__UNUSED__ -UYYPARSE_PARAM -UYYTYPE_INT16 -UYYTYPE_INT8 \
- 	-UYYTYPE_UINT16 -UYYTYPE_UINT8 -UYY_USER_INIT \
- 	-Ushort -Usize_t -Uyytext_ptr -Uyyoverflow
+ reporting-bugs.html: reporting-bugs.asc
+@@ -148,7 +152,7 @@ CSUPPRESSIONS = -U__UNUSED__ -UYYPARSE_PARAM -UYYTYPE_INT16 -UYYTYPE_INT8 \
+ 	-U_SC_NPROCESSORS_ONLN -Ushort -Usize_t -Uyytext_ptr \
+ 	-Uyyoverflow -U__cplusplus
  cppcheck:
--	cppcheck -I. --template gcc --enable=all $(SUPPRESSIONS) --suppress=unusedStructMember --suppress=unusedFunction --suppress=unreadVariable --suppress=uselessAssignmentPtrArg --suppress=missingIncludeSystem *.[ch]
-+	cppcheck -I. --template $(CC) --enable=all $(SUPPRESSIONS) --suppress=unusedStructMember --suppress=unusedFunction --suppress=unreadVariable --suppress=uselessAssignmentPtrArg --suppress=missingIncludeSystem *.[ch]
+-	cppcheck -I. --template gcc --enable=all $(CSUPPRESSIONS) --suppress=unusedStructMember --suppress=unusedFunction --suppress=unreadVariable --suppress=uselessAssignmentPtrArg --suppress=missingIncludeSystem *.[ch]
++	cppcheck -I. --template $(CC) --enable=all $(CSUPPRESSIONS) --suppress=unusedStructMember --suppress=unusedFunction --suppress=unreadVariable --suppress=uselessAssignmentPtrArg --suppress=missingIncludeSystem *.[ch]
  
- SOURCES = Makefile *.[ch] *.[yl] cvssync
- DOCS = README COPYING NEWS AUTHORS TODO control cvs-fast-export.asc cvssync.asc
+ PYLINTOPTS = --rcfile=/dev/null --reports=n \
+ 	--msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150409/90d6df6c/attachment.html>