aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2011-09-07 09:49:34 +0800
committervanilla <vanilla@FreeBSD.org>2011-09-07 09:49:34 +0800
commitb279f455a7ee2575ad0a51941e74634e5681736f (patch)
treef7fb26774e1131abe58447c4c3a284aa215d7a09
parent4e3e871b5389f3f267a1443722a4cc6c768f2fac (diff)
downloadfreebsd-ports-gnome-b279f455a7ee2575ad0a51941e74634e5681736f.tar.gz
freebsd-ports-gnome-b279f455a7ee2575ad0a51941e74634e5681736f.tar.zst
freebsd-ports-gnome-b279f455a7ee2575ad0a51941e74634e5681736f.zip
Fix build with clang.
-rw-r--r--net/sharity-light/files/patch-ad29
-rw-r--r--textproc/sgmls/files/patch-Makefile11
-rw-r--r--textproc/sgrep/files/patch-aa15
3 files changed, 41 insertions, 14 deletions
diff --git a/net/sharity-light/files/patch-ad b/net/sharity-light/files/patch-ad
index c287945cc7e8..66cdbea7d9bf 100644
--- a/net/sharity-light/files/patch-ad
+++ b/net/sharity-light/files/patch-ad
@@ -1,7 +1,7 @@
---- Makefile.orig Tue Nov 24 05:52:13 1998
-+++ Makefile Sat Jul 24 23:04:14 1999
-@@ -12,11 +12,11 @@
- ##############################################################################
+--- Makefile.orig 2003-12-29 19:11:57.000000000 +0800
++++ Makefile 2011-09-07 09:38:05.000000000 +0800
+@@ -15,11 +15,11 @@ THE_CC = gcc
+ # translation.
# For NEXTSTEP/OPENSTEP:
-CFLAGS = -Wall -O2 -traditional-cpp -g
@@ -16,21 +16,28 @@
# For Linux: (use static linking because of libc5/libc6 troubles)
#CFLAGS = -Wall -O2 -g
-@@ -24,9 +24,9 @@
+@@ -27,9 +27,9 @@ RPC_WARNFLAGS = -Wno-unused -Wno-switch
#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
# For FreeBSD
-#CFLAGS = -Wall -O2
-#THE_CC = cc
-#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
-+CFLAGS += -Wall
++CFLAGS += -Wall -Iinclude -I.
+THE_CC := $(CC)
+RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
- # For NetBsd
- #CFLAGS = -Wall -O2 -DNETBSD
-@@ -66,7 +66,7 @@
- OFILES = proc.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
+ # For MacOSX - essential BSD 4.4 OpenStep [contributed by Pete French]
+ #CFLAGS = -Wall -O4 -traditional-cpp -DBSD4_4_LITE2
+@@ -68,13 +68,13 @@ RPC_WARNFLAGS = -Wno-unused -Wno-switch
+ ##############################################################################
+
+ LD = ld
+-CC = $(THE_CC) $(INCLUDES)
++#CC = $(THE_CC) $(INCLUDES)
+ STRIP = strip
+
+ OFILES = proc.o recode.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
.c.o:
- $(CC) $(CFLAGS) $(ARCH) -c -o $*.o $<
@@ -38,7 +45,7 @@
all: $(NAME)
-@@ -74,7 +74,7 @@
+@@ -82,7 +82,7 @@ nfs_dir:
(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
$(NAME): $(OFILES) nfs_dir
diff --git a/textproc/sgmls/files/patch-Makefile b/textproc/sgmls/files/patch-Makefile
new file mode 100644
index 000000000000..0917d64669bb
--- /dev/null
+++ b/textproc/sgmls/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig 2011-09-07 09:34:45.000000000 +0800
++++ Makefile 2011-09-07 09:34:52.000000000 +0800
+@@ -15,7 +15,7 @@ MANDIR=$(PREFIX)/man/man$(MANEXT)
+ # Permissions mode to use for man pages.
+ MANMODE=444
+
+-CC=cc
++#CC=cc
+ PROFILE=
+ INCLUDE=
+ OPTIMIZE=-O
diff --git a/textproc/sgrep/files/patch-aa b/textproc/sgrep/files/patch-aa
index d4e33b33f4dd..b9f6d99fe34f 100644
--- a/textproc/sgrep/files/patch-aa
+++ b/textproc/sgrep/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile-- Wed Apr 29 12:08:55 1998
-+++ Makefile Wed Apr 29 12:20:29 1998
+--- Makefile.orig 1996-05-02 19:58:24.000000000 +0800
++++ Makefile 2011-09-07 09:33:07.000000000 +0800
@@ -10,11 +10,11 @@
#
@@ -15,7 +15,16 @@
# Where the sample rc file goes
RCFILE = $(LIBDIR)/sgreprc
# If you can't install as root you might wan't to use this as rc file
-@@ -45,11 +45,7 @@
+@@ -25,7 +25,7 @@ VERSION = 0.99
+ CFLAGS = -O -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\"
+ LDFLAGS =
+ # if cc fails to you use gcc
+-CC = cc
++#CC = cc
+ CPPFLAGS =
+ LIBS =
+
+@@ -45,11 +45,7 @@ sgrep: $(OBJECTS)
clean:
-rm -f $(OBJECTS)