summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2014-05-25 10:47:39 +0000
committerMartin Wilke <miwi@FreeBSD.org>2014-05-25 10:47:39 +0000
commitfe0e5623deb34e17e5d1f99c065e94d195801661 (patch)
treeef5ec8a2da15fec143f5f96c557de34373d745e3 /japanese
parentUpdate cpuminer to 2.4 (diff)
- Unbreak build with clang
PR: 184208 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=355158
Diffstat (limited to 'japanese')
-rw-r--r--japanese/plain2/files/patch-src-Makefile5
-rw-r--r--japanese/plain2/files/patch-src-plain2.c19
2 files changed, 22 insertions, 2 deletions
diff --git a/japanese/plain2/files/patch-src-Makefile b/japanese/plain2/files/patch-src-Makefile
index d1c807891c7b..27f8072af64c 100644
--- a/japanese/plain2/files/patch-src-Makefile
+++ b/japanese/plain2/files/patch-src-Makefile
@@ -1,6 +1,6 @@
--- src/Makefile.orig 2011-10-01 00:07:58.000000000 +0900
+++ src/Makefile 2011-10-01 00:08:17.000000000 +0900
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,9 @@
DEFINES=-DKANJI -DPICTURE -DHTML
@@ -8,10 +8,11 @@
-CFLAGS= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s
+CC?=gcc
+CFLAGS?= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s
++CFLAGS+= ${DEFINES}
#CC=cc
#CFLAGS= -O -fwritable-strings ${DEFINES} -DBSD -DDEBUG
-@@ -33,8 +33,8 @@
+@@ -33,8 +34,8 @@
OBJS_KANJI=roffout.o analyze.o table.o title.o picture.o ftitle.o
HDRS=plain2.h table.h picture.h kanji.h
diff --git a/japanese/plain2/files/patch-src-plain2.c b/japanese/plain2/files/patch-src-plain2.c
new file mode 100644
index 000000000000..3fde9304241c
--- /dev/null
+++ b/japanese/plain2/files/patch-src-plain2.c
@@ -0,0 +1,19 @@
+--- src/plain2.c.orig 2013-11-24 13:27:57.000000000 +0900
++++ src/plain2.c 2013-11-24 13:45:59.000000000 +0900
+@@ -643,7 +643,7 @@
+ char buf[MAX_LINE_LEN];
+ FILE *initf;
+ if ((plainEnv = getenv(PLAIN2_ENV)) == NULL)
+- return;
++ return 0;
+ if ((initf = fopen(plainEnv, "r")) == NULL) {
+ char envOpt[MAX_LINE_LEN];
+ strcpy(envOpt, plainEnv);
+@@ -669,6 +669,7 @@
+ }
+ fclose(initf);
+ }
++ return 0;
+ }
+ /*
+ * Save & Restore Parameters for Parsing