diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-28 11:51:05 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-28 11:51:05 +0000 |
| commit | 932db7c46c9a269808dfa67ea02746b350c194d8 (patch) | |
| tree | 5182ef394eeef9bff78abf27f4a3a05f7fb8ff43 /x11/xorg-cf-files | |
| parent | b9b5e71f19dfde1a969d42e0660cc786432b3500 (diff) | |
| download | ports-932db7c46c9a269808dfa67ea02746b350c194d8.tar.gz ports-932db7c46c9a269808dfa67ea02746b350c194d8.zip | |
Notes
Diffstat (limited to 'x11/xorg-cf-files')
| -rw-r--r-- | x11/xorg-cf-files/Makefile | 9 | ||||
| -rw-r--r-- | x11/xorg-cf-files/files/patch-FreeBSD.cf | 20 |
2 files changed, 17 insertions, 12 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 3e3bd6a51645..7fa17e150a38 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -3,6 +3,7 @@ PORTNAME= xorg-cf-files PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,14 +13,8 @@ LICENSE= MIT XORG_CAT= util -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \ ${WRKSRC}/X11.tmpl -.if defined(CC) && ${CC:T:M*clang*} == "clang" - ${REINPLACE_CMD} -e 's|/usr/bin/cpp|${LOCALBASE}/bin/ucpp|' \ - -e 's|-traditional|-s|' ${WRKSRC}/FreeBSD.cf -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xorg-cf-files/files/patch-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf index 524dee86e0ae..827c369e239a 100644 --- a/x11/xorg-cf-files/files/patch-FreeBSD.cf +++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf @@ -1,5 +1,5 @@ ---- FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 -+++ FreeBSD.cf Fri Sep 10 19:52:31 2004 +--- ./FreeBSD.cf.orig 2009-10-16 23:45:42.000000000 +0200 ++++ ./FreeBSD.cf 2013-06-27 17:14:30.661790922 +0200 @@ -78,6 +78,7 @@ #define HasIssetugid YES #define HasPoll YES @@ -25,7 +25,17 @@ #endif /* This fixes linking C programs against libGLU on FreeBSD 3.x */ -@@ -338,7 +333,7 @@ +@@ -178,7 +173,9 @@ + #ifndef CplusplusCmd + #define CplusplusCmd c++ + #endif ++#ifndef CppCmd + #define CppCmd /usr/bin/cpp ++#endif + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -338,7 +335,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -34,7 +44,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -466,14 +461,14 @@ +@@ -470,14 +467,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) @@ -51,7 +61,7 @@ #endif #ifndef PreIncDir -@@ -493,6 +493,10 @@ +@@ -498,6 +495,10 @@ #define SystemManDirectory /usr/share/man #endif |