summaryrefslogtreecommitdiff
path: root/biology/babel
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2004-02-01 22:02:22 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2004-02-01 22:02:22 +0000
commitd39eb55ced06144ce8218982305477b20421e547 (patch)
treebbc4184993a144fc5fed524e63691bf350dba07e /biology/babel
parent- Unbreak install (fix WRKSRC) (diff)
- Fix build on AMD64
- Use DOCSDIR
Notes
Notes: svn path=/head/; revision=99742
Diffstat (limited to 'biology/babel')
-rw-r--r--biology/babel/Makefile4
-rw-r--r--biology/babel/files/patch-block.c39
2 files changed, 41 insertions, 2 deletions
diff --git a/biology/babel/Makefile b/biology/babel/Makefile
index 0bd10053532c..204e2f72521d 100644
--- a/biology/babel/Makefile
+++ b/biology/babel/Makefile
@@ -29,8 +29,8 @@ do-install:
@${MKDIR} ${PREFIX}/share/babel
${INSTALL_DATA} ${WRKSRC}/*.lis ${PREFIX}/share/babel
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/babel
- ${INSTALL_DATA} ${WRKSRC}/README.1ST ${PREFIX}/share/doc/babel
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.1ST ${DOCSDIR}
.endif
.include <bsd.port.mk>
diff --git a/biology/babel/files/patch-block.c b/biology/babel/files/patch-block.c
new file mode 100644
index 000000000000..ab963562f575
--- /dev/null
+++ b/biology/babel/files/patch-block.c
@@ -0,0 +1,39 @@
+--- block.c.orig Tue Jan 21 16:52:32 1997
++++ block.c Sun Feb 1 22:56:41 2004
+@@ -7,6 +7,10 @@
+ */
+
+ #include "bbltyp.h"
++#include <osreldate.h>
++#if __FreeBSD_version > 500000
++#include <stdarg.h>
++#endif
+
+ /* the routine that does all the work */
+ static int block__doalloc(int, block_ptr *, const char *, va_list);
+@@ -99,7 +103,11 @@
+ void *array;
+
+ /* calc how much space we are gonna need */
++ #if __FreeBSD_version > 500000 && defined(__amd64__)
++ va_copy(ap, initap);
++ #else
+ ap = initap;
++ #endif
+ size = 0;
+ for(i=0; types[i] != '\0'; i++)
+ {
+@@ -115,8 +123,12 @@
+
+ /* set up the ptrs if we can alloc the memory */
+ if(*handle != NULL)
+- {
++ {
++ #if __FreeBSD_version > 500000 && defined(__amd64__)
++ va_copy(ap, initap);
++ #else
+ ap = initap;
++ #endif
+ ptr = 0;
+ for(i=0; types[i] != '\0'; i++)
+ {