Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Sep 2013 18:20:01 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/182130: commit references a PR
Message-ID:  <201309291820.r8TIK1dH004273@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/182130; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182130: commit references a PR
Date: Sun, 29 Sep 2013 18:19:18 +0000 (UTC)

 Author: ak
 Date: Sun Sep 29 18:19:03 2013
 New Revision: 328723
 URL: http://svnweb.freebsd.org/changeset/ports/328723
 
 Log:
   - Fix build with clang [1]
   - Support STAGEDIR
   - Rename patches
   
   PR:	ports/182130 [1]
   Submitted by:	Stefan `Sec` Zehl <sec@42.org> (maintainer)
 
 Added:
      - copied unchanged from r328719, head/x11/xmove/files/patch-ab
      - copied unchanged from r328719, head/x11/xmove/files/patch-aa
   head/x11/xmove/files/patch-xmovectrl_xmovectrl.c   (contents, props changed)
 Directory Properties:
   head/x11/xmove/files/patch-stdlib   (props changed)
   head/x11/xmove/files/patch-xmove_main.c   (props changed)
 Deleted:
   head/x11/xmove/files/patch-aa
   head/x11/xmove/files/patch-ab
 Modified:
   head/x11/xmove/Makefile   (contents, props changed)
   head/x11/xmove/pkg-plist   (contents, props changed)
 
 Modified: head/x11/xmove/Makefile
 ==============================================================================
 --- head/x11/xmove/Makefile	Sun Sep 29 18:07:04 2013	(r328722)
 +++ head/x11/xmove/Makefile	Sun Sep 29 18:19:03 2013	(r328723)
 @@ -16,11 +16,8 @@ WRKSRC=		${WRKDIR}/xmove
  USES=		imake
  USE_XORG=	x11
  
 -MAN1=		xmove.1 xmovectrl.1
 -
  WRKSRC=		${WRKDIR}/${PORTNAME}
  
 -NO_STAGE=	yes
  post-patch:
  	${CP} ${FILESDIR}/Imakefile ${WRKSRC}
  	(cd ${WRKSRC}; \
 
 Copied: head/x11/xmove/files/patch-stdlib (from r328719, head/x11/xmove/files/patch-ab)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/x11/xmove/files/patch-stdlib	Sun Sep 29 18:19:03 2013	(r328723, copy of r328719, head/x11/xmove/files/patch-ab)
 @@ -0,0 +1,88 @@
 +--- xmove/XMOVELib.c.org	Sat Oct 18 22:03:47 1997
 ++++ xmove/XMOVELib.c	Fri Jan 16 00:25:48 1998
 +@@ -24,7 +24,7 @@
 + 
 + #include <X11/Xatom.h>
 + #include <errno.h>             /* for EINTR, EADDRINUSE, ... */
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + #include <sys/ioctl.h>
 + #ifdef SYSV
 + #include <sys/fcntl.h>
 +--- xmove/externs.h.org	Thu Dec  1 22:14:38 1994
 ++++ xmove/externs.h	Fri Jan 16 00:25:48 1998
 +@@ -20,7 +20,7 @@
 + 
 + #include <sys/time.h>
 + #include <sys/socket.h>
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + 
 + 
 + #endif /* EXTERNS_H */
 +--- xmove/main.c.org	Fri Jan 16 00:24:41 1998
 ++++ xmove/main.c	Fri Jan 16 00:25:49 1998
 +@@ -42,7 +42,7 @@
 + #include <signal.h>
 + #define NEED_REPLIES
 + #include <X11/Xproto.h>
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + 
 + #if defined(DL_W_PRAGMA) || defined(DL_WOUT_PRAGMA)
 + #include <dlfcn.h>
 +--- xmove/move_window.c.org	Sun Apr 20 06:21:32 1997
 ++++ xmove/move_window.c	Fri Jan 16 00:25:50 1998
 +@@ -20,7 +20,7 @@
 + #define NEED_REPLIES
 + #include <X11/Xproto.h>
 + #include <X11/Xatom.h>
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + 
 + #include "xmove.h"
 + 
 +--- xmove/print11.c.org	Mon Jun 30 22:01:43 1997
 ++++ xmove/print11.c	Fri Jan 16 00:25:50 1998
 +@@ -109,7 +109,7 @@
 +  *
 +  */
 + 
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + #include <X11/Xatom.h>
 + #include "xmove.h"
 + 
 +--- xmove/put_image.c.org	Wed Jun 25 05:35:31 1997
 ++++ xmove/put_image.c	Fri Jan 16 00:25:51 1998
 +@@ -18,7 +18,7 @@
 + /* $XConsortium: XPutImage.c,v 11.60 91/06/07 16:33:38 rws Exp $ */
 + /* Copyright    Massachusetts Institute of Technology    1986	*/
 + 
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + 
 + #include "xmove.h"
 + 
 +--- xmove/server.c.org	Sun Aug  3 21:36:45 1997
 ++++ xmove/server.c	Fri Jan 16 00:25:51 1998
 +@@ -40,7 +40,7 @@
 + #include <sys/time.h>          /* for struct timeval * */
 + #include <errno.h>             /* for EINTR, EADDRINUSE, ... */
 + #include <X11/Xproto.h>
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + 
 + #include "xmove.h"
 + 
 +--- xmovectrl/xmovectrl.h.org	Mon Jan  9 20:02:28 1995
 ++++ xmovectrl/xmovectrl.h	Fri Jan 16 00:25:52 1998
 +@@ -54,7 +54,7 @@
 + 
 + #include <sys/time.h>
 + #include <sys/socket.h>
 +-#include <malloc.h>
 ++#include <stdlib.h>
 + 
 + 
 + Global int pad P((long n ));
 
 Copied: head/x11/xmove/files/patch-xmove_main.c (from r328719, head/x11/xmove/files/patch-aa)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/x11/xmove/files/patch-xmove_main.c	Sun Sep 29 18:19:03 2013	(r328723, copy of r328719, head/x11/xmove/files/patch-aa)
 @@ -0,0 +1,74 @@
 +--- xmove/main.c.org	Tue Oct 21 00:20:47 1997
 ++++ xmove/main.c	Fri Jan 16 00:24:41 1998
 +@@ -70,7 +70,7 @@
 + /*static char *OfficialName P((char *name ));*/
 + static void ResizeBuffer P((Buffer *buffer, long len));
 + static char *SetDefaultServer P((char *server_name));
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + static void SignalURG P((int signum ));
 + static void SignalPIPE P((int signum ));
 + static void SignalINT P((int signum ));
 +@@ -1233,7 +1233,7 @@
 + #endif
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalURG(int signum)
 + #else
 + SignalURG()
 +@@ -1243,7 +1243,7 @@
 + }
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalPIPE(int signum)
 + #else
 + SignalPIPE()
 +@@ -1253,7 +1253,7 @@
 + }
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalINT(int signum)
 + #else
 + SignalINT()
 +@@ -1264,7 +1264,7 @@
 + }
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalQUIT(int signum)
 + #else
 + SignalQUIT()
 +@@ -1275,7 +1275,7 @@
 + }
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalTERM(int signum)
 + #else
 + SignalTERM()
 +@@ -1286,7 +1286,7 @@
 + }
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalTSTP(int signum)
 + #else
 + SignalTSTP()
 +@@ -1296,7 +1296,7 @@
 + }
 + 
 + static void
 +-#ifdef SVR4
 ++#if defined(SVR4) || defined(BSD)
 + SignalCONT(int signum)
 + #else
 + SignalCONT()
 
 Added: head/x11/xmove/files/patch-xmovectrl_xmovectrl.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/x11/xmove/files/patch-xmovectrl_xmovectrl.c	Sun Sep 29 18:19:03 2013	(r328723)
 @@ -0,0 +1,18 @@
 +Index: xmovectrl/xmovectrl.c
 +@@ -33,6 +33,8 @@
 + int auth_namelen, auth_datalen;
 + char *auth_name, *auth_data;
 + 
 ++void DoServerSetup(int server_fd);
 ++
 + main(int argc, char **argv, char **envp)
 + {
 +      char **cur_argv = argv + 1;
 +@@ -143,6 +145,7 @@
 + }     
 + 
 + 
 ++void
 + DoServerSetup(int server_fd)
 + {
 +      unsigned char iobuf[512];
 
 Modified: head/x11/xmove/pkg-plist
 ==============================================================================
 --- head/x11/xmove/pkg-plist	Sun Sep 29 18:07:04 2013	(r328722)
 +++ head/x11/xmove/pkg-plist	Sun Sep 29 18:19:03 2013	(r328723)
 @@ -1,2 +1,4 @@
  bin/xmove
  bin/xmovectrl
 +man/man1/xmove.1.gz
 +man/man1/xmovectrl.1.gz
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309291820.r8TIK1dH004273>