aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorsf <sf@FreeBSD.org>2001-02-15 06:21:57 +0800
committersf <sf@FreeBSD.org>2001-02-15 06:21:57 +0800
commitba1c00ad5ddeabda83ea37ef3b1acede0ae98983 (patch)
tree3c29d62c6b1027299621b8ebfae664889ab43602 /x11-toolkits
parent8f8d0ff86e6367d0283e1cc1e1dfdf5c395429a5 (diff)
downloadfreebsd-ports-gnome-ba1c00ad5ddeabda83ea37ef3b1acede0ae98983.tar.gz
freebsd-ports-gnome-ba1c00ad5ddeabda83ea37ef3b1acede0ae98983.tar.zst
freebsd-ports-gnome-ba1c00ad5ddeabda83ea37ef3b1acede0ae98983.zip
o respect CFLAGS.
o use /usr/bin/cpp instead of /usr/libexec/cpp. o support NOPORTDOCS. Approved by: maintainer
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/open-motif/files/patch-FreeBSD.cf28
-rw-r--r--x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl11
-rw-r--r--x11-toolkits/open-motif/pkg-plist8
3 files changed, 37 insertions, 10 deletions
diff --git a/x11-toolkits/open-motif/files/patch-FreeBSD.cf b/x11-toolkits/open-motif/files/patch-FreeBSD.cf
index 93020eee1c61..12d9b275dab5 100644
--- a/x11-toolkits/open-motif/files/patch-FreeBSD.cf
+++ b/x11-toolkits/open-motif/files/patch-FreeBSD.cf
@@ -1,12 +1,28 @@
---- config/cf/FreeBSD.cf.dist Wed Jul 19 06:13:11 2000
-+++ config/cf/FreeBSD.cf Wed Jul 19 06:15:46 2000
-@@ -335,3 +335,3 @@
+--- config/cf/FreeBSD.cf.orig Sun Feb 11 08:23:51 2001
++++ config/cf/FreeBSD.cf Sun Feb 11 08:33:30 2001
+@@ -60,7 +60,7 @@
+ #define MkdirHierCmd mkdir -p
+
+ #define CcCmd cc
+-#define CppCmd /usr/libexec/cpp
++#define CppCmd /usr/bin/cpp
+ #define PreProcessCmd CppCmd
+ #define StandardCppDefines -traditional
+ #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
+@@ -333,14 +333,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)
-#define DefaultGcc2i386Opt -O2
-+#define DefaultGcc2i386Opt -O
++#define DefaultGcc2i386Opt
#endif
-@@ -342,3 +342,3 @@
+ #endif
+
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
-# define OptimizedCDebugFlags -O2
-+# define OptimizedCDebugFlags -O
++# define OptimizedCDebugFlags
#endif
+
+ #ifndef PreIncDir
diff --git a/x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl b/x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl
new file mode 100644
index 000000000000..870f8eafd3ae
--- /dev/null
+++ b/x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl
@@ -0,0 +1,11 @@
+--- config/cf/Imake.tmpl.orig Sun Feb 11 08:37:29 2001
++++ config/cf/Imake.tmpl Sun Feb 11 08:37:48 2001
+@@ -1334,7 +1334,7 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib
+ LDPOSTLIB = LdPostLib
diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
index 3e8a6bf4de40..85424237e4ff 100644
--- a/x11-toolkits/open-motif/pkg-plist
+++ b/x11-toolkits/open-motif/pkg-plist
@@ -418,12 +418,12 @@ lib/libUil.so.2
lib/libXm.a
lib/libXm.so
lib/libXm.so.2
-share/doc/openmotif/BUGREPORT
+%%PORTDOCS%%share/doc/openmotif/BUGREPORT
share/doc/openmotif/CLOSEDBUGS.gz
-share/doc/openmotif/COPYRIGHT.MOTIF
+%%PORTDOCS%%share/doc/openmotif/COPYRIGHT.MOTIF
share/doc/openmotif/OPENBUGS.gz
-share/doc/openmotif/README
-share/doc/openmotif/RELNOTES
+%%PORTDOCS%%share/doc/openmotif/README
+%%PORTDOCS%%share/doc/openmotif/RELNOTES
share/doc/openmotif/guides/README
share/doc/openmotif/guides/mot-cdesgr.ps.Z
share/doc/openmotif/guides/mot-csgcc.ps.Z