[Midnightbsd-cvs] mports [15971] trunk/devel/imake/files/patch-imakemdep.h: imake 1.0.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 28 21:54:07 EST 2014
Revision: 15971
http://svnweb.midnightbsd.org/mports/?rev=15971
Author: laffer1
Date: 2014-02-28 21:54:06 -0500 (Fri, 28 Feb 2014)
Log Message:
-----------
imake 1.0.6
Modified Paths:
--------------
trunk/devel/imake/Makefile
trunk/devel/imake/distinfo
trunk/devel/imake/files/patch-imake.c
Added Paths:
-----------
trunk/devel/imake/files/patch-imakemdep.h
Property Changed:
----------------
trunk/devel/imake/files/patch-imake.c
Modified: trunk/devel/imake/Makefile
===================================================================
--- trunk/devel/imake/Makefile 2014-03-01 02:51:20 UTC (rev 15970)
+++ trunk/devel/imake/Makefile 2014-03-01 02:54:06 UTC (rev 15971)
@@ -1,54 +1,28 @@
# $MidnightBSD$
PORTNAME= imake
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.6
PORTEPOCH= 1
CATEGORIES= devel
MAINTAINER= ports at MidnightBSD.org
COMMENT= Imake and other utilities from X.Org
-LICENSE= x11
-BUILD_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep \
+LICENSE= mit
+
+BUILD_DEPENDS= tradcpp:${PORTSDIR}/devel/tradcpp
+RUN_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep \
makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
-GNU_CONFIGURE= yes
-USE_PERL5= yes
-USE_PKGCONFIG= yes
+USES= shebangfix perl5 pkgconfig
+USE_PERL5= run
+SHEBANG_FILES= mkhtmlindex.pl
+
XORG_CAT= util
USE_XORG= xproto
-.ifdef USE_IMAKE
-.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
+CONFIGURE_ENV= ac_cv_path_RAWCPP=tradcpp
-MAN1= ccmakedep.1 \
- cleanlinks.1 \
- imake.1 \
- makeg.1 \
- mergelib.1 \
- mkdirhier.1 \
- mkhtmlindex.1 \
- revpath.1 \
- xmkmf.1
-
-post-patch:
- @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl
-
-.include <bsd.port.pre.mk>
-
-# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
-# which is fatal for imake.
-.if defined(CC) && ${CC} == "clang"
-BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp
-RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp
-CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s"
-
-post-build:
- ${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/devel/imake/distinfo
===================================================================
--- trunk/devel/imake/distinfo 2014-03-01 02:51:20 UTC (rev 15970)
+++ trunk/devel/imake/distinfo 2014-03-01 02:54:06 UTC (rev 15971)
@@ -1,3 +1,2 @@
-SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
-RMD160 (xorg/util/imake-1.0.4.tar.bz2) = 186e364e9b5dc7cad504625c6c3ffe98bed45134
-SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
+SHA256 (xorg/util/imake-1.0.6.tar.bz2) = fa8983fdb0a72ba8482d1d2683967fb45c29edd7149b25f619f97ea5a599069d
+SIZE (xorg/util/imake-1.0.6.tar.bz2) = 155571
Modified: trunk/devel/imake/files/patch-imake.c
===================================================================
--- trunk/devel/imake/files/patch-imake.c 2014-03-01 02:51:20 UTC (rev 15970)
+++ trunk/devel/imake/files/patch-imake.c 2014-03-01 02:54:06 UTC (rev 15971)
@@ -1,21 +1,33 @@
---- imake.c.orig 2006-05-15 16:28:14 -0400
-+++ imake.c 2009-05-25 20:45:58 -0400
-@@ -1161,34 +1161,7 @@
- static void
- get_binary_format(FILE *inFile)
- {
-- int mib[2];
-- size_t len;
-- int osrel = 0;
+--- imake.c.orig 2013-07-23 06:53:04.000000000 +0200
++++ imake.c 2013-08-31 14:57:48.000000000 +0200
+@@ -531,6 +531,14 @@
+ AddCppArg(p);
+ }
+ }
++ if ((p = getenv("IMAKECPPFLAGS"))) {
++ AddCppArg(p);
++ for (; *p; p++)
++ if (*p == ' ') {
++ *p++ = '\0';
++ AddCppArg(p);
++ }
++ }
+ if ((p = getenv("IMAKECPP")))
+ cpp = p;
+ if ((p = getenv("IMAKEMAKE")))
+@@ -1142,29 +1150,17 @@
+ int mib[2];
+ size_t len;
+ int osrel = 0;
- FILE *objprog = NULL;
-- int iself = 0;
+ int iself = 0;
- char buf[10];
- char cmd[PATH_MAX];
--
-- mib[0] = CTL_KERN;
-- mib[1] = KERN_OSRELDATE;
-- len = sizeof(osrel);
-- sysctl(mib, 2, &osrel, &len, NULL, 0);
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_OSRELDATE;
+ len = sizeof(osrel);
+ sysctl(mib, 2, &osrel, &len, NULL, 0);
- if (CrossCompiling) {
- strcpy (cmd, CrossCompileDir);
- strcat (cmd, "/");
@@ -22,17 +34,17 @@
- strcat (cmd,"objformat");
- } else
- strcpy (cmd, "objformat");
--
+
- if (osrel >= 300004 &&
- (objprog = popen(cmd, "r")) != NULL &&
- fgets(buf, sizeof(buf), objprog) != NULL &&
- strncmp(buf, "elf", 3) == 0)
-- iself = 1;
++ if (osrel < 300004)
++ iself = 0;
++ else
+ iself = 1;
- if (objprog)
- pclose(objprog);
--
-- fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
-+ fprintf(inFile, "#define DefaultToElfFormat %s\n", "YES");
+
+ fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
}
- #endif
-
Property changes on: trunk/devel/imake/files/patch-imake.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/devel/imake/files/patch-imakemdep.h
===================================================================
--- trunk/devel/imake/files/patch-imakemdep.h (rev 0)
+++ trunk/devel/imake/files/patch-imakemdep.h 2014-03-01 02:54:06 UTC (rev 15971)
@@ -0,0 +1,11 @@
+--- ./imakemdep.h.orig 2012-03-08 06:47:32.000000000 +0100
++++ ./imakemdep.h 2013-06-12 20:22:52.058999526 +0200
+@@ -380,7 +383,7 @@
+ defined(__GNUC__) || defined(__GLIBC__)
+ # ifdef __i386__
+ "-D__i386__",
+-# if defined(__GNUC__) && (__GNUC__ >= 3)
++# if defined(__GNUC__) && (__GNUC__ >= 3) && !defined(__FreeBSD__)
+ "-m32",
+ # endif
+ # endif
More information about the Midnightbsd-cvs
mailing list