diff options
| author | obache <obache@pkgsrc.org> | 2013-07-13 07:42:51 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2013-07-13 07:42:51 +0000 |
| commit | 1e625e587c51875bd8d5b75a37ba0d5ec3c19e70 (patch) | |
| tree | 2f9d37855a64d60484ffa4679ec8b8b179b05144 /devel/imake | |
| parent | 0173b92270fdea155eade2c22608cbc8b50a1148 (diff) | |
| download | pkgsrc-1e625e587c51875bd8d5b75a37ba0d5ec3c19e70.tar.gz | |
drop -m32 for i386, it's not a valid cpp flag.
Diffstat (limited to 'devel/imake')
| -rw-r--r-- | devel/imake/Makefile | 4 | ||||
| -rw-r--r-- | devel/imake/distinfo | 6 | ||||
| -rw-r--r-- | devel/imake/patches/patch-imake.c | 4 | ||||
| -rw-r--r-- | devel/imake/patches/patch-imakemdep.h | 12 |
4 files changed, 18 insertions, 8 deletions
diff --git a/devel/imake/Makefile b/devel/imake/Makefile index 7875c8de7b1..5e50c889b1e 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2013/07/02 12:12:48 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2013/07/13 07:42:51 obache Exp $ DISTNAME= imake-1.0.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/imake/distinfo b/devel/imake/distinfo index ab52fd08117..580b0ad6dfa 100644 --- a/devel/imake/distinfo +++ b/devel/imake/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2013/07/02 12:12:48 joerg Exp $ +$NetBSD: distinfo,v 1.6 2013/07/13 07:42:51 obache Exp $ SHA1 (imake-1.0.5.tar.bz2) = 1fd3dca267d125ad86583d7f9663b6ff532cddd1 RMD160 (imake-1.0.5.tar.bz2) = 0d29d2168b737c7fbe3420933625b4a883e1173f Size (imake-1.0.5.tar.bz2) = 148503 bytes -SHA1 (patch-imake.c) = e66ad9c4001eb4dc36ef8285159927dbb5316620 -SHA1 (patch-imakemdep.h) = 39ba14819dbbcd1a370a0dce0fb9fcaef8bf6e50 +SHA1 (patch-imake.c) = 8eeff6837a6007a933adf399bf6c929a49b8b4c4 +SHA1 (patch-imakemdep.h) = 38a23728979dc3cf4bd483c827f902f86d0e9c7c diff --git a/devel/imake/patches/patch-imake.c b/devel/imake/patches/patch-imake.c index 2599a7bc62d..dc0e5133d00 100644 --- a/devel/imake/patches/patch-imake.c +++ b/devel/imake/patches/patch-imake.c @@ -1,6 +1,6 @@ -$NetBSD: patch-imake.c,v 1.1 2013/07/02 12:12:48 joerg Exp $ +$NetBSD: patch-imake.c,v 1.2 2013/07/13 07:42:52 obache Exp $ ---- imake.c.orig 2013-06-13 22:21:17.000000000 +0000 +--- imake.c.orig 2012-03-08 05:47:32.000000000 +0000 +++ imake.c @@ -1336,54 +1336,8 @@ get_gcc_version(FILE *inFile, char *name static boolean diff --git a/devel/imake/patches/patch-imakemdep.h b/devel/imake/patches/patch-imakemdep.h index 88b4a39fcbe..4de4d375553 100644 --- a/devel/imake/patches/patch-imakemdep.h +++ b/devel/imake/patches/patch-imakemdep.h @@ -1,4 +1,4 @@ -$NetBSD: patch-imakemdep.h,v 1.2 2013/07/02 12:12:48 joerg Exp $ +$NetBSD: patch-imakemdep.h,v 1.3 2013/07/13 07:42:52 obache Exp $ --- imakemdep.h.orig 2012-03-08 05:47:32.000000000 +0000 +++ imakemdep.h @@ -100,3 +100,13 @@ $NetBSD: patch-imakemdep.h,v 1.2 2013/07/02 12:12:48 joerg Exp $ "-I.", /* add current directory to include path */ # if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103080000 # ifdef unix +@@ -380,9 +300,6 @@ const char *cpp_argv[ARGUMENTS] = { + defined(__GNUC__) || defined(__GLIBC__) + # ifdef __i386__ + "-D__i386__", +-# if defined(__GNUC__) && (__GNUC__ >= 3) +- "-m32", +-# endif + # endif + # ifdef __i486__ + "-D__i486__", |