svn commit: r422544 - in head/devel/ucpp: . files
Jung-uk Kim
jkim at FreeBSD.org
Tue Sep 20 20:50:04 UTC 2016
Author: jkim
Date: Tue Sep 20 20:50:02 2016
New Revision: 422544
URL: https://svnweb.freebsd.org/changeset/ports/422544
Log:
Revert r422537 and use the official repository, not a fork.
Approved by: crees
PR: 212719
Added:
head/devel/ucpp/files/patch-Makefile (contents, props changed)
Deleted:
head/devel/ucpp/pkg-plist
Modified:
head/devel/ucpp/Makefile
head/devel/ucpp/distinfo
head/devel/ucpp/files/patch-cpp.c
head/devel/ucpp/pkg-descr
Modified: head/devel/ucpp/Makefile
==============================================================================
--- head/devel/ucpp/Makefile Tue Sep 20 20:37:41 2016 (r422543)
+++ head/devel/ucpp/Makefile Tue Sep 20 20:50:02 2016 (r422544)
@@ -2,22 +2,26 @@
# $FreeBSD$
PORTNAME= ucpp
-PORTVERSION= 1.3.4
+PORTVERSION= 1.3.2
+PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= # GITHUB
+MASTER_SITES= GH
MAINTAINER= crees at FreeBSD.org
COMMENT= C preprocessor and lexer
LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+GH_ACCOUNT= lpsantil
+GH_TAGNAME= 31b719e
USE_GITHUB= yes
-GH_ACCOUNT= scarabeusiv
-USES= autoreconf libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
-GNU_CONFIGURE= yes
-post-patch:
- ${REINPLACE_CMD} '/^CFLAGS/s/-ansi//' ${WRKSRC}/configure.ac
+PLIST_FILES= bin/ucpp man/man1/ucpp.1.gz
+USES= gmake
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
.include <bsd.port.mk>
Modified: head/devel/ucpp/distinfo
==============================================================================
--- head/devel/ucpp/distinfo Tue Sep 20 20:37:41 2016 (r422543)
+++ head/devel/ucpp/distinfo Tue Sep 20 20:50:02 2016 (r422544)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474029495
-SHA256 (scarabeusiv-ucpp-1.3.4_GH0.tar.gz) = 35958c5f3bb3851c03d3f442cc072cf27b21dc8478e1eecfce289b1c5aba951a
-SIZE (scarabeusiv-ucpp-1.3.4_GH0.tar.gz) = 92999
+TIMESTAMP = 1474394679
+SHA256 (lpsantil-ucpp-1.3.2-31b719e_GH0.tar.gz) = 475f1c2eb64998387cbab315c1c1bcd381644a14e6885aa434056fbf706b5e8f
+SIZE (lpsantil-ucpp-1.3.2-31b719e_GH0.tar.gz) = 97594
Added: head/devel/ucpp/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ucpp/files/patch-Makefile Tue Sep 20 20:50:02 2016 (r422544)
@@ -0,0 +1,24 @@
+Fixes clang build
+
+--- Makefile.orig 2015-03-21 06:43:07 UTC
++++ Makefile
+@@ -56,8 +56,8 @@
+ #FLAGS = -O -m -DMEM_CHECK
+
+ # for gcc
+-CC = gcc
+-FLAGS = -O3 -W -Wall -ansi
++CC ?= cc
++FLAGS = -ansi -DAUDIT -DMEM_DEBUG
+ #FLAGS = -g -W -Wall -ansi -DAUDIT -DMEM_DEBUG
+ #FLAGS = -O3 -mcpu=pentiumpro -fomit-frame-pointer -W -Wall -ansi -DMEM_CHECK
+ #FLAGS = -O -pg -W -Wall -ansi -DMEM_CHECK
+@@ -88,7 +88,7 @@ endif
+ # ----- nothing should be changed below this line -----
+
+ COBJ = mem.o nhash.o cpp.o lexer.o assert.o macro.o eval.o
+-CFLAGS = $(FLAGS)
++CFLAGS += $(FLAGS)
+
+ all: ucpp
+ @ar cq libucpp.a *.o
Modified: head/devel/ucpp/files/patch-cpp.c
==============================================================================
--- head/devel/ucpp/files/patch-cpp.c Tue Sep 20 20:37:41 2016 (r422543)
+++ head/devel/ucpp/files/patch-cpp.c Tue Sep 20 20:50:02 2016 (r422544)
@@ -1,6 +1,6 @@
---- cpp.c.orig 2008-10-01 21:15:41.000000000 +0400
-+++ src/cpp.c 2011-03-17 21:08:15.000000000 +0300
-@@ -65,8 +65,8 @@
+--- cpp.c.orig 2015-03-21 06:43:07 UTC
++++ cpp.c
+@@ -65,8 +65,8 @@ int emit_dependencies = 0, emit_defines
FILE *emit_output;
#ifdef STAND_ALONE
@@ -11,7 +11,7 @@
#endif
char *current_filename = 0, *current_long_filename = 0;
-@@ -2364,7 +2364,7 @@
+@@ -2371,7 +2371,7 @@ static int parse_opt(int argc, char *arg
char *filename = 0;
int with_std_incpath = 1;
int print_version = 0, print_defs = 0, print_asserts = 0;
Modified: head/devel/ucpp/pkg-descr
==============================================================================
--- head/devel/ucpp/pkg-descr Tue Sep 20 20:37:41 2016 (r422543)
+++ head/devel/ucpp/pkg-descr Tue Sep 20 20:50:02 2016 (r422544)
@@ -6,4 +6,4 @@ ucpp is a C preprocessor and lexer. It h
- Possibility to use the code as a lexer (that outputs tokens
directly)
-WWW: https://github.com/scarabeusiv/ucpp
+WWW: http://code.google.com/p/ucpp/
More information about the svn-ports-head
mailing list