diff options
author | tv <tv> | 2005-01-24 16:58:06 +0000 |
---|---|---|
committer | tv <tv> | 2005-01-24 16:58:06 +0000 |
commit | 0ae8d6c9f04e4f411f6ce8e0ab161f12da818006 (patch) | |
tree | 597bc9c373a54f5092b8da807e53cca0ccb0538d | |
parent | 3cae8404303825a7c603a824a152abe28b8000c1 (diff) | |
download | pkgsrc-0ae8d6c9f04e4f411f6ce8e0ab161f12da818006.tar.gz |
Fix build on Interix. (Changes submitted to author.)
-rw-r--r-- | archivers/dar/Makefile | 8 | ||||
-rw-r--r-- | archivers/dar/distinfo | 10 | ||||
-rw-r--r-- | archivers/dar/hacks.mk | 13 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ab | 13 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ac | 13 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ad | 14 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ae | 14 | ||||
-rw-r--r-- | archivers/dar/patches/patch-af | 14 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ag | 14 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ah | 14 | ||||
-rw-r--r-- | archivers/dar/patches/patch-ai | 14 |
11 files changed, 133 insertions, 8 deletions
diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile index 224945d0aff..d17efed6a65 100644 --- a/archivers/dar/Makefile +++ b/archivers/dar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/01/21 02:29:33 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/01/24 16:58:06 tv Exp $ DISTNAME= dar-2.1.5 CATEGORIES= archivers sysutils @@ -21,12 +21,6 @@ CONFIGURE_ARGS+= --disable-dar-static CONFIGURE_ARGS+= --enable-examples CONFIGURE_ARGS+= --disable-upx -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Interix" -CONFIGURE_ARGS+= --enable-os-bits=32 -.endif - .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo index 22b19680aa7..c636973d563 100644 --- a/archivers/dar/distinfo +++ b/archivers/dar/distinfo @@ -1,5 +1,13 @@ -$NetBSD: distinfo,v 1.3 2004/11/09 13:02:39 adam Exp $ +$NetBSD: distinfo,v 1.4 2005/01/24 16:58:06 tv Exp $ SHA1 (dar-2.1.5.tar.gz) = 992836c05c685933e56e8035e00313008567948a Size (dar-2.1.5.tar.gz) = 652534 bytes SHA1 (patch-aa) = 6f07f2bf85194cdad58d99c7cafd85e3b2c06031 +SHA1 (patch-ab) = 215f457ca03dcf86fba50c00198c934cfe0c915d +SHA1 (patch-ac) = 0c3ae6c7c247b85257c4ebdfb7b1da8b2baf6e45 +SHA1 (patch-ad) = 45c1532ec5cf72d148fa331986e1680e7dcb099c +SHA1 (patch-ae) = ab19ec5783d24df4e3e73c0cea7262aefb4196e1 +SHA1 (patch-af) = 967783c3d53fb975d436662121dd8f9db285b9aa +SHA1 (patch-ag) = c99b58ae072c22ec2e4b85a6fc9a35edb7968385 +SHA1 (patch-ah) = 01916f19ad0e14d0840de5223d8625e610b83f51 +SHA1 (patch-ai) = a22efc4a16f79ab80a74a3bae21f403d128f54ae diff --git a/archivers/dar/hacks.mk b/archivers/dar/hacks.mk new file mode 100644 index 00000000000..e67d50d07a4 --- /dev/null +++ b/archivers/dar/hacks.mk @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2005/01/24 16:58:06 tv Exp $ + +.ifndef DAR_HACKS_MK +DAR_HACKS_MK= # defined + +### [Mon Jan 24 16:39:35 UTC 2005 : tv] +### Interix has no <inttypes.h>/<stdint.h> +### +.if ${OPSYS} == "Interix" +CONFIGURE_ARGS+= --enable-os-bits=32 +.endif + +.endif diff --git a/archivers/dar/patches/patch-ab b/archivers/dar/patches/patch-ab new file mode 100644 index 00000000000..9013f7079d7 --- /dev/null +++ b/archivers/dar/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- configure.ac.orig 2005-01-24 11:28:25.000000000 -0500 ++++ configure.ac +@@ -47,7 +47,7 @@ AC_HEADER_STDC + AC_HEADER_SYS_WAIT + AC_CHECK_HEADER(zlib.h, [], [AC_MSG_ERROR([Cannot find zlib.h header file])]) + AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR([Cannot find bzlib.h header file])]) +-AC_CHECK_HEADERS([fcntl.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h]) ++AC_CHECK_HEADERS([fcntl.h netinet/in.h arpa/inet.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h]) + + AC_SYS_LARGEFILE + diff --git a/archivers/dar/patches/patch-ac b/archivers/dar/patches/patch-ac new file mode 100644 index 00000000000..a325ae4b029 --- /dev/null +++ b/archivers/dar/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- configure.orig 2005-01-24 11:28:21.000000000 -0500 ++++ configure +@@ -20128,7 +20128,7 @@ fi + + + +-for ac_header in fcntl.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h ++for ac_header in fcntl.h netinet/in.h arpa/inet.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h termios.h unistd.h utime.h sys/types.h signal.h errno.h sys/un.h sys/stat.h time.h fnmatch.h regex.h pwd.h grp.h getopt.h stdio.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/archivers/dar/patches/patch-ad b/archivers/dar/patches/patch-ad new file mode 100644 index 00000000000..541853b5692 --- /dev/null +++ b/archivers/dar/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- src/libdar/catalogue.cpp.orig 2005-01-24 11:29:06.000000000 -0500 ++++ src/libdar/catalogue.cpp +@@ -35,6 +35,9 @@ extern "C" + #if HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#if HAVE_ARPA_INET_H ++#include <arpa/inet.h> ++#endif + + #ifdef STDC_HEADERS + #include <ctype.h> diff --git a/archivers/dar/patches/patch-ae b/archivers/dar/patches/patch-ae new file mode 100644 index 00000000000..f80bc00c50f --- /dev/null +++ b/archivers/dar/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- src/libdar/header.cpp.orig 2005-01-24 11:29:34.000000000 -0500 ++++ src/libdar/header.cpp +@@ -35,6 +35,9 @@ extern "C" + #if HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#if HAVE_ARPA_INET_H ++#include <arpa/inet.h> ++#endif + + #if TIME_WITH_SYS_TIME + # include <sys/time.h> diff --git a/archivers/dar/patches/patch-af b/archivers/dar/patches/patch-af new file mode 100644 index 00000000000..aff68884080 --- /dev/null +++ b/archivers/dar/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- src/libdar/zapette.cpp.orig 2005-01-24 11:30:02.000000000 -0500 ++++ src/libdar/zapette.cpp +@@ -36,6 +36,9 @@ extern "C" + #if HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#if HAVE_ARPA_INET_H ++#include <arpa/inet.h> ++#endif + } // end extern "C" + + #include <string> diff --git a/archivers/dar/patches/patch-ag b/archivers/dar/patches/patch-ag new file mode 100644 index 00000000000..052230673c7 --- /dev/null +++ b/archivers/dar/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- src/dar_suite/data_tree.cpp.orig 2005-01-24 11:30:25.000000000 -0500 ++++ src/dar_suite/data_tree.cpp +@@ -35,6 +35,9 @@ extern "C" + #if HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#if HAVE_ARPA_INET_H ++#include <arpa/inet.h> ++#endif + } // end extern "C" + + #include <iomanip> diff --git a/archivers/dar/patches/patch-ah b/archivers/dar/patches/patch-ah new file mode 100644 index 00000000000..2ee656f5d0d --- /dev/null +++ b/archivers/dar/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- config.h.in.orig 2005-01-24 11:40:24.000000000 -0500 ++++ config.h.in +@@ -21,6 +21,9 @@ + */ + #undef HAVE_ALLOCA_H + ++/* Define to 1 if you have the <arpa/inet.h> header file. */ ++#undef HAVE_ARPA_INET_H ++ + /* Define to 1 if you have the `btowc' function. */ + #undef HAVE_BTOWC + diff --git a/archivers/dar/patches/patch-ai b/archivers/dar/patches/patch-ai new file mode 100644 index 00000000000..79b8acd6b1d --- /dev/null +++ b/archivers/dar/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1 2005/01/24 16:58:06 tv Exp $ + +--- src/libdar/filesystem.cpp.orig 2005-01-24 11:52:38.000000000 -0500 ++++ src/libdar/filesystem.cpp +@@ -93,6 +93,9 @@ char *strchr (), *strrchr (); + + #if MAJOR_IN_MKDEV + #include <sys/mkdev.h> ++#if !defined(makedev) && defined(mkdev) ++#define makedev(a,b) mkdev((a),(b)) ++#endif + #else + #if MAJOR_IN_SYSMACROS + #include <sys/sysmacros.h> |