From 400dd65d7a6aec11ee76859e69934210bd007ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
Date: Wed, 23 Sep 2020 12:14:29 +0000
Subject: MFH: r549712

misc/wmjulia fix 13-Current build

Another instance of -fno-common issue.

While here:

 * Add missig USE_XORG dependency
 * Reorganize WRKSRC so we don't generate weird patches
 * Pet linters

PR:	249462
Submitted by:	jd.fbsd@goneja.de

Approved by:	ports-secteam (blanket, runtime fix, -fno-common)
---
 misc/wmjulia/Makefile                          | 11 +++++---
 misc/wmjulia/files/patch-Makefile              | 36 --------------------------
 misc/wmjulia/files/patch-wmgeneral_wmgeneral.c | 12 +++++++++
 misc/wmjulia/files/patch-wmgeneral_wmgeneral.h | 15 +++++++++++
 misc/wmjulia/files/patch-wmjulia_Makefile      | 36 ++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 40 deletions(-)
 delete mode 100644 misc/wmjulia/files/patch-Makefile
 create mode 100644 misc/wmjulia/files/patch-wmgeneral_wmgeneral.c
 create mode 100644 misc/wmjulia/files/patch-wmgeneral_wmgeneral.h
 create mode 100644 misc/wmjulia/files/patch-wmjulia_Makefile

diff --git a/misc/wmjulia/Makefile b/misc/wmjulia/Makefile
index 0cc4a48fb91a..1ce65b5b4401 100644
--- a/misc/wmjulia/Makefile
+++ b/misc/wmjulia/Makefile
@@ -12,12 +12,15 @@ COMMENT=	Dockapp that creates an animated Julia set
 
 LICENSE=	GPLv2
 
-PLIST_FILES=	bin/wmjulia
-WRKSRC=	${WRKDIR}/${PORTNAME}.app/${PORTNAME}
 USES=		gmake xorg
-USE_XORG=	xpm xext
+USE_XORG=	x11 xext xpm
+
+WRKSRC=		${WRKDIR}/${PORTNAME}.app
+PLIST_FILES=	bin/wmjulia
+
+MAKE_ARGS=	-C ${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/misc/wmjulia/files/patch-Makefile b/misc/wmjulia/files/patch-Makefile
deleted file mode 100644
index 7494b6b795f7..000000000000
--- a/misc/wmjulia/files/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Thu May 16 12:16:40 2002
-+++ Makefile	Thu May 16 12:17:17 2002
-@@ -1,21 +1,20 @@
--INCDIR	=	-I/usr/X11R6/include
--LIBDIR	=	-L/usr/X11R6/lib
--LIBS	=	-lXpm -lXext -lX11 -lm
--OBJS	=	wmjulia.o ../wmgeneral/wmgeneral.o 
-+CC ?= gcc
-+CFLAGS += -c -Wall
-+INCDIR = -I${LOCALBASE}/include
-+LIBDIR = -L${LOCALBASE}/lib
-+LIBS   = -lXpm -lXext -lX11 -lm
-+OBJS =  wmjulia.o ../wmgeneral/wmgeneral.o
- 
- .c.o:
--	cc -c -g -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR)
--
--all: wmjulia
-+	${CC} ${CFLAGS} ${INCDIR} -D${shell echo `uname -s`} $< -o $*.o
- 
- wmjulia: $(OBJS)
--	cc -o wmjulia $^ $(LIBDIR) $(LIBS)
-+	${CC} -o wmjulia $^ ${LIBDIR} ${LIBS}
-+
-+all: wmjulia
- 
- clean:
--	for i in $(OBJS) ; do \
-+	for i in ${OBJS}; do \
- 		rm -f $$i; \
- 	done
--	rm -f wmjulia
--
--install:
--	mv wmjulia /usr/local/bin
-+	rm -f wmjulia core
diff --git a/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c b/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c
new file mode 100644
index 000000000000..a9e8942ce132
--- /dev/null
+++ b/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c
@@ -0,0 +1,12 @@
+--- wmgeneral/wmgeneral.c.orig	2020-09-23 12:34:09 UTC
++++ wmgeneral/wmgeneral.c
+@@ -57,6 +57,9 @@
+  /* X11 Variables */
+ /*****************/
+ 
++Display		*display;
++Window		Root, iconwin, win;
++XpmIcon		wmgen;
+ int			screen;
+ int			x_fd;
+ int			d_depth;
diff --git a/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h b/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h
new file mode 100644
index 000000000000..d1911343dd64
--- /dev/null
+++ b/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h
@@ -0,0 +1,15 @@
+--- wmgeneral/wmgeneral.h.orig	2020-09-23 12:34:16 UTC
++++ wmgeneral/wmgeneral.h
+@@ -36,9 +36,9 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root, iconwin, win;
+-XpmIcon		wmgen;
++extern Display		*display;
++extern Window          Root, iconwin, win;
++extern XpmIcon		wmgen;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/misc/wmjulia/files/patch-wmjulia_Makefile b/misc/wmjulia/files/patch-wmjulia_Makefile
new file mode 100644
index 000000000000..1cea59961069
--- /dev/null
+++ b/misc/wmjulia/files/patch-wmjulia_Makefile
@@ -0,0 +1,36 @@
+--- wmjulia/Makefile.orig	1999-04-19 21:52:15 UTC
++++ wmjulia/Makefile
+@@ -1,21 +1,20 @@
+-INCDIR	=	-I/usr/X11R6/include
+-LIBDIR	=	-L/usr/X11R6/lib
+-LIBS	=	-lXpm -lXext -lX11 -lm
+-OBJS	=	wmjulia.o ../wmgeneral/wmgeneral.o 
++CC ?= gcc
++CFLAGS += -c -Wall
++INCDIR = -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
++LIBS   = -lXpm -lXext -lX11 -lm
++OBJS =  wmjulia.o ../wmgeneral/wmgeneral.o
+ 
+ .c.o:
+-	cc -c -g -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR)
++	${CC} ${CFLAGS} ${INCDIR} -D${shell echo `uname -s`} $< -o $*.o
+ 
+-all: wmjulia
+-
+ wmjulia: $(OBJS)
+-	cc -o wmjulia $^ $(LIBDIR) $(LIBS)
++	${CC} -o wmjulia $^ ${LIBDIR} ${LIBS}
+ 
++all: wmjulia
++
+ clean:
+-	for i in $(OBJS) ; do \
++	for i in ${OBJS}; do \
+ 		rm -f $$i; \
+ 	done
+-	rm -f wmjulia
+-
+-install:
+-	mv wmjulia /usr/local/bin
++	rm -f wmjulia core
-- 
cgit v1.2.3