mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

misc/wmjulia fix 13-Current build

Browse Source 
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
MFH:	2020Q3 (build fix, -fno-common)
This commit is contained in:
Fernando Apesteguía 2020-09-23 12:10:46 +00:00
parent 5b7a14fcb9
commit 862a3a9022
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=549712
4 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/wmjulia/Makefile
View File

@ -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>

12
misc/wmjulia/files/patch-wmgeneral_wmgeneral.c Normal file
View File

@ -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;

15
misc/wmjulia/files/patch-wmgeneral_wmgeneral.h Normal file
View File

@ -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 */

12
misc/wmjulia/files/patch-Makefile → misc/wmjulia/files/patch-wmjulia_Makefile
View File

@ -1,5 +1,5 @@
--- Makefile.orig Thu May 16 12:16:40 2002
+++ Makefile Thu May 16 12:17:17 2002
--- 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
@ -14,16 +14,16 @@
.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
-all: wmjulia
-
wmjulia: $(OBJS)
- cc -o wmjulia $^ $(LIBDIR) $(LIBS)
+ ${CC} -o wmjulia $^ ${LIBDIR} ${LIBS}
+
+all: wmjulia
+all: wmjulia
+
clean:
- for i in $(OBJS) ; do \
+ for i in ${OBJS}; do \