summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2010-03-29 23:43:41 +0000
committerJonathan Callen <jcallen@gentoo.org>2010-03-29 23:43:41 +0000
commit320ae47f01a6b8b56f58aee60fd9e07d2a0062a9 (patch)
tree4201cac83ed0a187f5e16acf72b145e930a53c57 /app-arch/arj/files
parentBump to EAPI=3, add prefix keywords (diff)
downloadhistorical-320ae47f01a6b8b56f58aee60fd9e07d2a0062a9.tar.gz
historical-320ae47f01a6b8b56f58aee60fd9e07d2a0062a9.tar.bz2
historical-320ae47f01a6b8b56f58aee60fd9e07d2a0062a9.zip
Bump to EAPI=3, add prefix keywords & patches
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'app-arch/arj/files')
-rw-r--r--app-arch/arj/files/arj-3.10.22-darwin.patch41
-rw-r--r--app-arch/arj/files/arj-3.10.22-interix.patch45
2 files changed, 86 insertions, 0 deletions
diff --git a/app-arch/arj/files/arj-3.10.22-darwin.patch b/app-arch/arj/files/arj-3.10.22-darwin.patch
new file mode 100644
index 000000000000..a09c30d3126d
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-darwin.patch
@@ -0,0 +1,41 @@
+--- arj-3.10.22/environ.c
++++ arj-3.10.22/environ.c
+@@ -58,7 +58,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/statfs.h>
+ #include <sys/statvfs.h>
+- #elif defined(__FreeBSD__)||defined(__NetBSD__)
++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #elif defined(__QNXNTO__)
+--- arj-3.10.22/gnu/configure.in
++++ arj-3.10.22/gnu/configure.in
+@@ -62,6 +62,11 @@
+ DLL_FLAGS="-shared -export-dynamic"
+ LD_STRIP="gnu/stripgcc.lnk"
+ ;;
++*darwin*)
++ # not ELF
++ DLL_EXT=".dylib"
++ DLL_FLAGS=""
++ ;;
+ interix3*)
+ # not ELF
+ DLL_FLAGS="-shared"
+--- arj-3.10.22/arjcrypt.c
++++ arj-3.10.22/arjcrypt.c
+@@ -329,6 +329,13 @@
+ }
+ #endif
+
++#if defined(__APPLE__)
++int main()
++{
++ return(0);
++}
++#endif
++
+ /* External entry */
+
+ #if TARGET==DOS
diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch
new file mode 100644
index 000000000000..8294f1e96bb4
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-interix.patch
@@ -0,0 +1,45 @@
+diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c
+--- arj-3.10.22.orig/environ.c 2008-03-30 16:51:40 +0200
++++ arj-3.10.22/environ.c 2008-03-30 16:50:16 +0200
+@@ -61,7 +61,7 @@
+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+- #elif defined(__QNXNTO__)
++ #elif defined(__QNXNTO__) || defined(__INTERIX)
+ #include <sys/statvfs.h>
+ #else
+ #include <sys/statfs.h>
+@@ -2286,7 +2286,7 @@
+ else
+ return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
+ #elif TARGET==UNIX
+- #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
++ #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)
+ struct statvfs vfs;
+
+ if(statvfs(name, &vfs)==-1)
+@@ -3802,7 +3802,9 @@
+ #elif TARGET==WIN32
+ return(0);
+ #elif TARGET==UNIX
++ #ifndef __INTERIX
+ sync();
++ #endif
+ return(0);
+ #endif
+ }
+diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in
+--- arj-3.10.22.orig/gnu/configure.in 2008-03-30 16:51:40 +0200
++++ arj-3.10.22/gnu/configure.in 2008-03-30 16:41:37 +0200
+@@ -67,8 +67,9 @@
+ DLL_EXT=".dylib"
+ DLL_FLAGS=""
+ ;;
+-interix3*)
++interix*)
+ # not ELF
++ DYN_LIBS="-ldl"
+ DLL_FLAGS="-shared"
+ DLL_CFLAGS=""
+ ;;