svn commit: r434194 - in head/x11-wm/fvwm: . files

[Tijl Coosemans]

Author: tijl
Date: Wed Feb 15 20:31:16 2017
New Revision: 434194
URL: https://svnweb.freebsd.org/changeset/ports/434194

Log:
  Remove -fPIC and fix the real problem where a variable is defined as an
  array in one file and declared as a pointer in another.

Added:
  head/x11-wm/fvwm/files/patch-fvwm-functions.c   (contents, props changed)
Modified:
  head/x11-wm/fvwm/Makefile

Modified: head/x11-wm/fvwm/Makefile
==============================================================================
--- head/x11-wm/fvwm/Makefile	Wed Feb 15 20:22:23 2017	(r434193)
+++ head/x11-wm/fvwm/Makefile	Wed Feb 15 20:31:16 2017	(r434194)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	1.24r
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-1/
 PKGNAMESUFFIX=	1${PKGNAMESUFFIX2}
@@ -14,8 +14,6 @@ COMMENT=	Fvwm window manager
 USES=		imake
 USE_XORG=	xbitmaps xpm xext x11 xmu
 
-CFLAGS_aarch64=	-fPIC
-
 pre-configure:
 	${REINPLACE_CMD} -e '/DependSubdirs/y,/*#,   ,' ${WRKSRC}/Imakefile
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \

Added: head/x11-wm/fvwm/files/patch-fvwm-functions.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/fvwm/files/patch-fvwm-functions.c	Wed Feb 15 20:31:16 2017	(r434194)
@@ -0,0 +1,20 @@
+--- fvwm/functions.c.orig	1994-11-15 14:18:26 UTC
++++ fvwm/functions.c
+@@ -52,7 +52,7 @@
+ extern XEvent Event;
+ extern FvwmWindow *Tmp_win;
+ extern int menuFromFrameOrWindowOrTitlebar;
+-extern DoHandlePageing;
++extern Bool DoHandlePageing;
+ 
+ extern char **g_argv;
+ 
+@@ -1643,7 +1643,7 @@ void MapIt(FvwmWindow *t)
+ 
+ void QuickRestart(void)
+ {
+-  extern char *m4_options;
++  extern char m4_options[];
+   extern char *display_name;
+   int i;
+   FvwmWindow *tmp,*next;