svn commit: r396088 - in head/devel/ossp-xds: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Sep  4 13:07:20 2015
New Revision: 396088
URL: https://svnweb.freebsd.org/changeset/ports/396088

Log:
  - Unbreak the build on PowerPC (at least) by always using va_copy() macro for
    copying variable argument lists, not just on AMD64 (also regenerate a patch
    with `make makepatch' command)
  - Simplify `check' target and rename it to our more standard `regression-test'

Modified:
  head/devel/ossp-xds/Makefile
  head/devel/ossp-xds/files/patch-xds.c

Modified: head/devel/ossp-xds/Makefile
==============================================================================
--- head/devel/ossp-xds/Makefile	Fri Sep  4 13:00:54 2015	(r396087)
+++ head/devel/ossp-xds/Makefile	Fri Sep  4 13:07:20 2015	(r396088)
@@ -15,16 +15,11 @@ USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-check:  build
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxds.so
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
+regression-test: build
+	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} check -C ${WRKSRC}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/ossp-xds/files/patch-xds.c
==============================================================================
--- head/devel/ossp-xds/files/patch-xds.c	Fri Sep  4 13:00:54 2015	(r396087)
+++ head/devel/ossp-xds/files/patch-xds.c	Fri Sep  4 13:07:20 2015	(r396088)
@@ -1,14 +1,11 @@
---- xds.c.orig	Mon Feb 17 21:33:40 2003
-+++ xds.c	Sat May 29 19:07:41 2004
-@@ -383,7 +383,11 @@
+--- xds.c.orig	2005-06-02 18:50:56 UTC
++++ xds.c
+@@ -383,7 +383,7 @@ int xds_vencode(xds_t *xds, const char *
  
                  /* Execute the engine. */
                  used_buffer_size = 0;
-+#ifdef __amd64__
+-                args_backup = args;
 +                va_copy(args_backup, args);
-+#else
-                 args_backup = args;
-+#endif
                  rc = (*xds->engines[pos].engine)(
                           xds, xds->engines[pos].context,
                           xds->buffer + xds->buffer_len,