Date: Sun, 13 Jan 2019 15:25:52 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490145 - in head/devel/aegis: . files Message-ID: <201901131525.x0DFPqUw050616@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Jan 13 15:25:51 2019 New Revision: 490145 URL: https://svnweb.freebsd.org/changeset/ports/490145 Log: devel/aegis: fix build with clang PR: 234881 Submitted by: aryeh.friedman@gmail.com (maintainer) Added: head/devel/aegis/files/patch-common_ac_shared__ptr.h (contents, props changed) head/devel/aegis/files/patch-common_ac_string.h (contents, props changed) head/devel/aegis/files/patch-etc_configure.ac (contents, props changed) head/devel/aegis/files/patch-libaegis_introspector_time.h (contents, props changed) head/devel/aegis/files/patch-libaegis_introspector_vector.h (contents, props changed) Modified: head/devel/aegis/Makefile (contents, props changed) Modified: head/devel/aegis/Makefile ============================================================================== --- head/devel/aegis/Makefile Sun Jan 13 15:23:01 2019 (r490144) +++ head/devel/aegis/Makefile Sun Jan 13 15:25:51 2019 (r490145) @@ -4,7 +4,7 @@ PORTNAME= aegis PORTVERSION= 4.25 DISTVERSIONSUFFIX= .D510 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MASTER_SITES= SF @@ -18,7 +18,6 @@ RUN_DEPENDS= tkdiff:textproc/tkdiff USES= gettext ghostscript groff perl5 tk USE_GNOME= libxml2 -USE_GCC= any GNU_CONFIGURE= yes CPPFLAGS+= "-I${LOCALBASE}/include" CONFIGURE_ARGS= --with-nlsdir="${PREFIX}/share/locale" Added: head/devel/aegis/files/patch-common_ac_shared__ptr.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/aegis/files/patch-common_ac_shared__ptr.h Sun Jan 13 15:25:51 2019 (r490145) @@ -0,0 +1,26 @@ +--- common/ac/shared_ptr.h.orig 2012-12-04 02:03:33 UTC ++++ common/ac/shared_ptr.h +@@ -21,23 +21,6 @@ + #define COMMON_AC_SHARED_PTR_H + + #include <common/config.h> +- +-#ifdef HAVE_TR1_MEMORY +- +-#include <tr1/memory> +- +-#define aegis_shared_ptr std::tr1::shared_ptr +- +-#elif HAVE_BOOST_SHARED_PTR_HPP +- +-#include <boost/shared_ptr.hpp> +- +-#define aegis_shared_ptr boost::shared_ptr +- +-#else +- + #include <common/ac/shared_ptr/aegis.h> + +-#endif +- + #endif // COMMON_AC_SHARED_PTR_H Added: head/devel/aegis/files/patch-common_ac_string.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/aegis/files/patch-common_ac_string.h Sun Jan 13 15:25:51 2019 (r490145) @@ -0,0 +1,15 @@ +--- common/ac/string.h.orig 2012-12-04 02:03:33 UTC ++++ common/ac/string.h +@@ -128,10 +128,12 @@ size_t strlcat(char *dst, const char *sr + char *strendcpy(char *dst, const char *src, const char *end); + #endif + ++/* + #undef strcat + #define strcat strcat_is_unsafe__use_strendcat_instead@ + #undef strcpy + #define strcpy strcpy_is_unsafe__use_strendcpy_instead@ ++*/ + + #ifndef HAVE_MEMMEM + void *memmem(const void *, size_t, const void *, size_t); Added: head/devel/aegis/files/patch-etc_configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/aegis/files/patch-etc_configure.ac Sun Jan 13 15:25:51 2019 (r490145) @@ -0,0 +1,37 @@ +--- etc/configure.ac.orig 2012-12-04 02:03:33 UTC ++++ etc/configure.ac +@@ -649,8 +649,8 @@ AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(long long) + +-AC_COMPUTE_INT(ac_cv_long_bit, [sizeof(long) * CHAR_BIT], [#include <limits.h>], +- [ac_cv_long_bit="sizeof(long) * CHAR_BIT"]) ++AC_COMPUTE_INT(ac_cv_long_bit, [LONG_BIT], [#include <limits.h>], ++ [ac_cv_long_bit="LONG_BIT"]) + AC_DEFINE_UNQUOTED(LONG_BIT, [$ac_cv_long_bit], + [Define this symbol to be the number of bits in a long. + This is analogous to the standard CHAR_BIT define.]) +@@ -849,15 +849,15 @@ dnl! + AC_MSG_CHECKING([for tm_zone in struct tm]) + AC_TRY_COMPILE([ + #include <stdio.h> +-#ifdef TIME_WITH_SYS_TIME +-#include <sys/time.h> +-#include <time.h> +-#else +-#ifdef HAVE_SYS_TIME_H ++dnl! #ifdef TIME_WITH_SYS_TIME + #include <sys/time.h> +-#else +-#include <time.h> +-#endif ++dnl! #include <time.h> ++dnl! #else ++dnl! #ifdef HAVE_SYS_TIME_H ++dnl! #include <sys/time.h> ++dnl! #else ++dnl! #include <time.h> ++dnl! #endif + #endif], [struct tm *tm; + printf("%s\n", tm->tm_zone);], + AC_DEFINE(HAVE_tm_zone,1, Added: head/devel/aegis/files/patch-libaegis_introspector_time.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/aegis/files/patch-libaegis_introspector_time.h Sun Jan 13 15:25:51 2019 (r490145) @@ -0,0 +1,10 @@ +--- libaegis/introspector/time.h.orig 2012-12-04 02:03:33 UTC ++++ libaegis/introspector/time.h +@@ -19,6 +19,7 @@ + #ifndef LIBAEGIS_INTROSPECTOR_TIME_H + #define LIBAEGIS_INTROSPECTOR_TIME_H + ++#include <time.h> + #include <libaegis/introspector.h> + #include <libaegis/output.h> + Added: head/devel/aegis/files/patch-libaegis_introspector_vector.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/aegis/files/patch-libaegis_introspector_vector.h Sun Jan 13 15:25:51 2019 (r490145) @@ -0,0 +1,10 @@ +--- libaegis/introspector/vector.h.orig 2012-12-04 02:03:33 UTC ++++ libaegis/introspector/vector.h +@@ -19,6 +19,7 @@ + #ifndef LIBAEGIS_INTROSPECTOR_VECTOR_H + #define LIBAEGIS_INTROSPECTOR_VECTOR_H + ++#include <sys/types.h> + #include <libaegis/introspector.h> + + /**
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901131525.x0DFPqUw050616>