Attachment 149986 Details for Bug 189975 – Fix port and upgrade to the latest version available

[patch] Fix port and upgrade to the latest version available

cssc.diff (text/plain), 4.94 KB, created by Rodrigo Osorio on 2014-11-29 11:04:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodrigo Osorio

Created: 2014-11-29 11:04:15 UTC

Size: 4.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373499)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cssc
>-PORTVERSION=	1.3.0
>+PORTVERSION=	1.4.0
> CATEGORIES=	devel
> MASTER_SITES=	GNU
> DISTNAME=	CSSC-${PORTVERSION}
>@@ -14,6 +14,7 @@
> 
> GNU_CONFIGURE=	yes
> INFO=		cssc
>+USE_GCC=	any
> 
> OPTIONS_DEFINE=			BINARY
> OPTIONS_DEFAULT=		BINARY
>Index: distinfo
>===================================================================
>--- distinfo	(revision 373499)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (CSSC-1.3.0.tar.gz) = 95053aab534c111648ea5b096037673b541a0c2960574d8addf70201a5337c2e
>-SIZE (CSSC-1.3.0.tar.gz) = 1608481
>+SHA256 (CSSC-1.4.0.tar.gz) = 30146f96c26c2a4c6b742bc8a498993ec6ea9f289becaaf566866488600b2994
>+SIZE (CSSC-1.4.0.tar.gz) = 2012122
>Index: files/patch-bsd__sccs.1
>===================================================================
>--- files/patch-bsd__sccs.1	(revision 373499)
>+++ files/patch-bsd__sccs.1	(working copy)
>@@ -1,26 +0,0 @@
>---- ./bsd/sccs.1.orig	2013-10-10 00:25:57.000000000 -0400
>-+++ ./bsd/sccs.1	2013-10-10 00:26:42.000000000 -0400
>-@@ -523,7 +523,6 @@
>- Copyright \(co 1983, 1990, 1993
>- .br
>- The Regents of the University of California.  All rights reserved.
>--
>- .Pp
>- Redistribution and use in source and binary forms, with or without
>- modification, are permitted provided that the following conditions
>-@@ -548,7 +547,6 @@
>- Neither the name of the University nor the names of its contributors
>- may be used to endorse or promote products derived from this software
>- without specific prior written permission.
>--
>- .El
>- .Pp
>- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
>-@@ -562,7 +560,6 @@
>- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
>- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>- SUCH DAMAGE.
>--
>- .Sh HISTORY
>- The
>- .Nm sccs
>Index: files/patch-docs__cssc.texi
>===================================================================
>--- files/patch-docs__cssc.texi	(revision 373499)
>+++ files/patch-docs__cssc.texi	(working copy)
>@@ -1,11 +0,0 @@
>---- ./docs/cssc.texi.orig	2010-05-16 13:52:32.000000000 -0400
>-+++ ./docs/cssc.texi	2013-10-10 00:25:34.000000000 -0400
>-@@ -5,7 +5,7 @@
>- 
>- @dircategory Miscellaneous
>- @direntry
>--* cssc: (cssc).		The GNU work-alike replacement for SCCS.
>-+* cssc: (cssc).			The GNU work-alike replacement for SCCS.
>- @end direntry
>- 
>- @copying
>Index: files/patch-unit-tests__googletest__include__gtest__internal__gtest-port.h
>===================================================================
>--- files/patch-unit-tests__googletest__include__gtest__internal__gtest-port.h	(revision 373499)
>+++ files/patch-unit-tests__googletest__include__gtest__internal__gtest-port.h	(working copy)
>@@ -1,52 +0,0 @@
>---- unit-tests/googletest/include/gtest/internal/gtest-port.h.orig	2010-05-15 22:30:14.000000000 +0000
>-+++ unit-tests/googletest/include/gtest/internal/gtest-port.h
>-@@ -80,6 +80,7 @@
>- // the given platform; otherwise undefined):
>- //   GTEST_OS_AIX      - IBM AIX
>- //   GTEST_OS_CYGWIN   - Cygwin
>-+//   GTEST_OS_FREEBSD  - FreeBSD
>- //   GTEST_OS_LINUX    - Linux
>- //   GTEST_OS_MAC      - Mac OS X
>- //   GTEST_OS_SOLARIS  - Sun Solaris
>-@@ -219,10 +220,13 @@
>- #define GTEST_OS_SOLARIS 1
>- #elif defined(_AIX)
>- #define GTEST_OS_AIX 1
>-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
>-+#define GTEST_OS_FREEBSD 1
>-+#define GTEST_USE_OWN_TR1_TUPLE 1
>- #endif  // __CYGWIN__
>- 
>- #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \
>--    GTEST_OS_SOLARIS || GTEST_OS_AIX
>-+    GTEST_OS_SOLARIS || GTEST_OS_AIX || GTEST_OS_FREEBSD
>- 
>- // On some platforms, <regex.h> needs someone to define size_t, and
>- // won't compile otherwise.  We can #include it here as we already
>-@@ -254,7 +258,8 @@
>- #define GTEST_USES_SIMPLE_RE 1
>- 
>- #endif  // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC ||
>--        // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX
>-+        // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX ||
>-+        // GTEST_OS_FREEBSD
>- 
>- #ifndef GTEST_HAS_EXCEPTIONS
>- // The user didn't tell us whether exceptions are enabled, so we need
>-@@ -376,7 +381,7 @@
>- //
>- // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
>- // to your compiler flags.
>--#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC)
>-+#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_FREEBSD)
>- #endif  // GTEST_HAS_PTHREAD
>- 
>- // Determines whether Google Test can use tr1/tuple.  You can define
>-@@ -483,6 +488,7 @@
>- // abort() in a VC 7.1 application compiled as GUI in debug config
>- // pops up a dialog window that cannot be suppressed programmatically.
>- #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
>-+     GTEST_OS_FREEBSD || \
>-      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
>-      GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX)
>- #define GTEST_HAS_DEATH_TEST 1

Actions: View | Diff

Attachments on bug 189975: 149986