aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2003-10-18 22:35:59 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2003-10-18 22:35:59 +0000
commit70b27b37d1e33fe1f7d902400c2f6a6aa8b3e30d (patch)
tree165ade5a65767629e60502e560d2e030c4d4a3d5 /japanese
parent785ba084b08ee8bdd26476a77f69eb90e2e14b3f (diff)
downloadports-70b27b37d1e33fe1f7d902400c2f6a6aa8b3e30d.tar.gz
ports-70b27b37d1e33fe1f7d902400c2f6a6aa8b3e30d.zip
Notes
Diffstat (limited to 'japanese')
-rw-r--r--japanese/plain2/Makefile8
-rw-r--r--japanese/plain2/files/patch-src::macro.c31
2 files changed, 32 insertions, 7 deletions
diff --git a/japanese/plain2/Makefile b/japanese/plain2/Makefile
index 711e4927a166..841037f6ba73 100644
--- a/japanese/plain2/Makefile
+++ b/japanese/plain2/Makefile
@@ -26,12 +26,6 @@ USE_REINPLACE= yes
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DBSD -DKANJI -DPICTURE -DHTML -fwritable-strings"
ALL_TARGET= ${PORTNAME}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN= "Does not compile"
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
's|/usr/lib/plain2|${DATADIR}|g' ${BUILD_WRKSRC}/plain2.h
@@ -41,4 +35,4 @@ do-install:
@${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${DATADIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/plain2/files/patch-src::macro.c b/japanese/plain2/files/patch-src::macro.c
new file mode 100644
index 000000000000..aa8e9b3e65c2
--- /dev/null
+++ b/japanese/plain2/files/patch-src::macro.c
@@ -0,0 +1,31 @@
+--- src/macro.c.orig Sat Oct 18 23:46:14 2003
++++ src/macro.c Sat Oct 18 23:47:36 2003
+@@ -8,7 +8,7 @@
+
+ #include <stdio.h>
+ #include <ctype.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "plain2.h"
+ #include "macro.h"
+
+@@ -189,9 +189,7 @@
+ buf++;
+ }
+ }
+-putMacro(macroNum, va_alist)
+-int macroNum;
+-va_dcl
++putMacro(int macroNum, char *fmt, ...)
+ {
+ va_list ap;
+ union macroArg {
+@@ -226,7 +224,7 @@
+ }
+ mip = mip->cmac_next;
+ }
+- va_start(ap);
++ va_start(ap, fmt);
+ for (i = 1; i <= maxarg; i++) {
+ switch(argtype[i]) {
+ case ATYPE_VOID: