diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2020-09-23 12:14:29 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2020-09-23 12:14:29 +0000 |
| commit | 400dd65d7a6aec11ee76859e69934210bd007ecd (patch) | |
| tree | 9cbb28440c42c9dbdca19903acf401834e9d996f | |
| parent | 5813fcd1b35f86cbf3eb2bb1648d4139b6b2f7df (diff) | |
| download | ports-400dd65d7a6aec11ee76859e69934210bd007ecd.tar.gz ports-400dd65d7a6aec11ee76859e69934210bd007ecd.zip | |
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)
Notes
Notes:
svn path=/branches/2020Q3/; revision=549714
| -rw-r--r-- | misc/wmjulia/Makefile | 11 | ||||
| -rw-r--r-- | misc/wmjulia/files/patch-wmgeneral_wmgeneral.c | 12 | ||||
| -rw-r--r-- | misc/wmjulia/files/patch-wmgeneral_wmgeneral.h | 15 | ||||
| -rw-r--r-- | misc/wmjulia/files/patch-wmjulia_Makefile (renamed from misc/wmjulia/files/patch-Makefile) | 12 |
4 files changed, 40 insertions, 10 deletions
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-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-Makefile b/misc/wmjulia/files/patch-wmjulia_Makefile index 7494b6b795f7..1cea59961069 100644 --- a/misc/wmjulia/files/patch-Makefile +++ b/misc/wmjulia/files/patch-wmjulia_Makefile @@ -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 \ |