Date: Wed, 23 Sep 2020 12:14:29 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r549714 - in branches/2020Q3/misc/wmjulia: . files Message-ID: <202009231214.08NCETnA071363@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Wed Sep 23 12:14:29 2020 New Revision: 549714 URL: https://svnweb.freebsd.org/changeset/ports/549714 Log: 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) Added: branches/2020Q3/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c - copied unchanged from r549712, head/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c branches/2020Q3/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h - copied unchanged from r549712, head/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h branches/2020Q3/misc/wmjulia/files/patch-wmjulia_Makefile - copied unchanged from r549712, head/misc/wmjulia/files/patch-wmjulia_Makefile Deleted: branches/2020Q3/misc/wmjulia/files/patch-Makefile Modified: branches/2020Q3/misc/wmjulia/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/misc/wmjulia/Makefile ============================================================================== --- branches/2020Q3/misc/wmjulia/Makefile Wed Sep 23 12:14:07 2020 (r549713) +++ branches/2020Q3/misc/wmjulia/Makefile Wed Sep 23 12:14:29 2020 (r549714) @@ -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> Copied: branches/2020Q3/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c (from r549712, head/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/misc/wmjulia/files/patch-wmgeneral_wmgeneral.c Wed Sep 23 12:14:29 2020 (r549714, copy of r549712, head/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; Copied: branches/2020Q3/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h (from r549712, head/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/misc/wmjulia/files/patch-wmgeneral_wmgeneral.h Wed Sep 23 12:14:29 2020 (r549714, copy of r549712, head/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 */ Copied: branches/2020Q3/misc/wmjulia/files/patch-wmjulia_Makefile (from r549712, head/misc/wmjulia/files/patch-wmjulia_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/misc/wmjulia/files/patch-wmjulia_Makefile Wed Sep 23 12:14:29 2020 (r549714, copy of r549712, head/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009231214.08NCETnA071363>