Attachment #149986 for bug #189975

View | Details | Raw Unified | Return to bug 189975
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cssc	4	PORTNAME= cssc
5	PORTVERSION= 1.3.0	5	PORTVERSION= 1.4.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= GNU	7	MASTER_SITES= GNU
8	DISTNAME= CSSC-${PORTVERSION}	8	DISTNAME= CSSC-${PORTVERSION}
Lines 14-19 Link Here
14		14
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
16	INFO= cssc	16	INFO= cssc
		17	USE_GCC= any
17		18
18	OPTIONS_DEFINE= BINARY	19	OPTIONS_DEFINE= BINARY
19	OPTIONS_DEFAULT= BINARY	20	OPTIONS_DEFAULT= BINARY

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (CSSC-1.3.0.tar.gz) = 95053aab534c111648ea5b096037673b541a0c2960574d8addf70201a5337c2e	1	SHA256 (CSSC-1.4.0.tar.gz) = 30146f96c26c2a4c6b742bc8a498993ec6ea9f289becaaf566866488600b2994
2	SIZE (CSSC-1.3.0.tar.gz) = 1608481	2	SIZE (CSSC-1.4.0.tar.gz) = 2012122




--- ./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

Lines 1-11 Link Here

(-)files/patch-docs__cssc.texi (-11 lines)
1	--- ./docs/cssc.texi.orig 2010-05-16 13:52:32.000000000 -0400
2	+++ ./docs/cssc.texi 2013-10-10 00:25:34.000000000 -0400
3	@@ -5,7 +5,7 @@
4
5	@dircategory Miscellaneous
6	@direntry
7	-* cssc: (cssc). The GNU work-alike replacement for SCCS.
8	+* cssc: (cssc). The GNU work-alike replacement for SCCS.
9	@end direntry
10
11	@copying




--- 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

Return to bug 189975

Lines 1-26 Link Here

(-)files/patch-bsd__sccs.1 (-26 lines)
1	--- ./bsd/sccs.1.orig 2013-10-10 00:25:57.000000000 -0400
2	+++ ./bsd/sccs.1 2013-10-10 00:26:42.000000000 -0400
3	@@ -523,7 +523,6 @@
4	Copyright \(co 1983, 1990, 1993
5	.br
6	The Regents of the University of California. All rights reserved.
7	-
8	.Pp
9	Redistribution and use in source and binary forms, with or without
10	modification, are permitted provided that the following conditions
11	@@ -548,7 +547,6 @@
12	Neither the name of the University nor the names of its contributors
13	may be used to endorse or promote products derived from this software
14	without specific prior written permission.
15	-
16	.El
17	.Pp
18	THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
19	@@ -562,7 +560,6 @@
20	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
21	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
22	SUCH DAMAGE.
23	-
24	.Sh HISTORY
25	The
26	.Nm sccs

Lines 1-52 Link Here

(-)files/patch-unit-tests__googletest__include__gtest__internal__gtest-port.h (-52 lines)
1	--- unit-tests/googletest/include/gtest/internal/gtest-port.h.orig 2010-05-15 22:30:14.000000000 +0000
2	+++ unit-tests/googletest/include/gtest/internal/gtest-port.h
3	@@ -80,6 +80,7 @@
4	// the given platform; otherwise undefined):
5	// GTEST_OS_AIX - IBM AIX
6	// GTEST_OS_CYGWIN - Cygwin
7	+// GTEST_OS_FREEBSD - FreeBSD
8	// GTEST_OS_LINUX - Linux
9	// GTEST_OS_MAC - Mac OS X
10	// GTEST_OS_SOLARIS - Sun Solaris
11	@@ -219,10 +220,13 @@
12	#define GTEST_OS_SOLARIS 1
13	#elif defined(_AIX)
14	#define GTEST_OS_AIX 1
15	+#elif defined(__FreeBSD__) \|\| defined(__DragonFly__)
16	+#define GTEST_OS_FREEBSD 1
17	+#define GTEST_USE_OWN_TR1_TUPLE 1
18	#endif // __CYGWIN__
19
20	#if GTEST_OS_CYGWIN \|\| GTEST_OS_LINUX \|\| GTEST_OS_MAC \|\| GTEST_OS_SYMBIAN \|\| \
21	- GTEST_OS_SOLARIS \|\| GTEST_OS_AIX
22	+ GTEST_OS_SOLARIS \|\| GTEST_OS_AIX \|\| GTEST_OS_FREEBSD
23
24	// On some platforms, <regex.h> needs someone to define size_t, and
25	// won't compile otherwise. We can #include it here as we already
26	@@ -254,7 +258,8 @@
27	#define GTEST_USES_SIMPLE_RE 1
28
29	#endif // GTEST_OS_CYGWIN \|\| GTEST_OS_LINUX \|\| GTEST_OS_MAC \|\|
30	- // GTEST_OS_SYMBIAN \|\| GTEST_OS_SOLARIS \|\| GTEST_OS_AIX
31	+ // GTEST_OS_SYMBIAN \|\| GTEST_OS_SOLARIS \|\| GTEST_OS_AIX \|\|
32	+ // GTEST_OS_FREEBSD
33
34	#ifndef GTEST_HAS_EXCEPTIONS
35	// The user didn't tell us whether exceptions are enabled, so we need
36	@@ -376,7 +381,7 @@
37	//
38	// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
39	// to your compiler flags.
40	-#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX \|\| GTEST_OS_MAC)
41	+#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX \|\| GTEST_OS_MAC \|\| GTEST_OS_FREEBSD)
42	#endif // GTEST_HAS_PTHREAD
43
44	// Determines whether Google Test can use tr1/tuple. You can define
45	@@ -483,6 +488,7 @@
46	// abort() in a VC 7.1 application compiled as GUI in debug config
47	// pops up a dialog window that cannot be suppressed programmatically.
48	#if (GTEST_OS_LINUX \|\| GTEST_OS_MAC \|\| GTEST_OS_CYGWIN \|\| GTEST_OS_SOLARIS \|\| \
49	+ GTEST_OS_FREEBSD \|\| \
50	(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) \|\| \
51	GTEST_OS_WINDOWS_MINGW \|\| GTEST_OS_AIX)
52	#define GTEST_HAS_DEATH_TEST 1