diff options
| author | cheusov <cheusov@pkgsrc.org> | 2014-08-13 20:22:09 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2014-08-13 20:22:09 +0000 |
| commit | de7c50151e624027bceff220ad105a2513274471 (patch) | |
| tree | 9baff727ae66716b51a13999aa0276ddb1057e89 /devel/scmcvs | |
| parent | 10c87d07f1e2137fd0d4ecb0fd92d9773ddef1b6 (diff) | |
| download | pkgsrc-de7c50151e624027bceff220ad105a2513274471.tar.gz | |
Fix for build failure on Interix caused by sizeof(intmax_t) == 0
++pkgrevision
Diffstat (limited to 'devel/scmcvs')
| -rw-r--r-- | devel/scmcvs/Makefile | 10 | ||||
| -rw-r--r-- | devel/scmcvs/distinfo | 4 | ||||
| -rw-r--r-- | devel/scmcvs/patches/patch-av | 24 |
3 files changed, 29 insertions, 9 deletions
diff --git a/devel/scmcvs/Makefile b/devel/scmcvs/Makefile index 8448926afd0..2dc10c55739 100644 --- a/devel/scmcvs/Makefile +++ b/devel/scmcvs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2014/08/13 18:30:03 cheusov Exp $ +# $NetBSD: Makefile,v 1.12 2014/08/13 20:22:09 cheusov Exp $ DISTNAME= cvs-1.12.13 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel scm MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/feature/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= makeinfo +USE_TOOLS+= makeinfo autoconf GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-external-zlib CONFIGURE_ARGS+= --with-rsh=ssh @@ -31,5 +31,9 @@ CONFIGURE_ARGS+= --enable-case-sensitivity .include "options.mk" +AUTOCONF_REQD= 2.50 +pre-configure: + cd ${WRKSRC} && autoconf + .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo index 8cf79affba2..85655e70f1e 100644 --- a/devel/scmcvs/distinfo +++ b/devel/scmcvs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2014/08/13 18:30:03 cheusov Exp $ +$NetBSD: distinfo,v 1.12 2014/08/13 20:22:09 cheusov Exp $ SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9 RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487 @@ -20,7 +20,7 @@ SHA1 (patch-aq) = b7cabaf9b713aac2a199a98a91432f1abf406c82 SHA1 (patch-ar) = 3cb7fce566606a3757f51d5ca562a8117ebfec92 SHA1 (patch-at) = 618673945aa10053f9fed5bee71b51605f39f4b4 SHA1 (patch-au) = 2f906a2940c496c4ecfcbb6efaf79fe43726a12c -SHA1 (patch-av) = 5cff0af09fd16509758aed06b5d9ce1b3985b1a9 +SHA1 (patch-av) = 717cb93ddc642d3b4a6afb2e62cddd313f93f98b SHA1 (patch-ay) = 6ce1c3c21dbc478248068f8b8850c21b0cb48c42 SHA1 (patch-az) = 9dfd460ae6617f1492e0e6861387ff80080a7d5d SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07 diff --git a/devel/scmcvs/patches/patch-av b/devel/scmcvs/patches/patch-av index 76c5f0aa62a..fe1fb33ff21 100644 --- a/devel/scmcvs/patches/patch-av +++ b/devel/scmcvs/patches/patch-av @@ -1,8 +1,24 @@ -$NetBSD: patch-av,v 1.3 2013/10/14 06:51:02 adam Exp $ +$NetBSD: patch-av,v 1.4 2014/08/13 20:22:09 cheusov Exp $ ---- configure.in.orig 2008-05-07 20:10:34.000000000 +0000 -+++ configure.in -@@ -587,7 +587,7 @@ if test -n "$krb_h"; then +Chunk #1: +include both stdint.h and inttypes.h if they are available. +This fixes build failure on Interix-6.1 (sizeof (intmax_t) == 0). +--- /tmp/obj-pkgsrc/devel/scmcvs/work/cvs-1.12.13/configure.in.orig Mon Oct 3 13:34:45 2005 ++++ /tmp/obj-pkgsrc/devel/scmcvs/work/cvs-1.12.13/configure.in Wed Aug 13 20:01:29 2014 +@@ -394,11 +394,10 @@ + AC_CHECK_SIZEOF(intmax_t, [], [[#include <stdio.h> + #ifdef HAVE_INTTYPES_H + #include <inttypes.h> +-#else ++#endif + #ifdef HAVE_STDINT_H + #include <stdint.h> + #endif +-#endif + ]]) + AC_CACHE_CHECK(for uniquely sized intmax_t, + ccvs_cv_unique_int_type_intmax_t, +@@ -587,7 +586,7 @@ [LDFLAGS=$hold_ldflags # Using open here instead of printf so we don't # get confused by the cached value for printf from above. |