Date: Sun, 23 Aug 2020 16:08:44 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545828 - in head/x11-clocks/wmcalclock: . files Message-ID: <202008231608.07NG8iBE039850@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Aug 23 16:08:43 2020 New Revision: 545828 URL: https://svnweb.freebsd.org/changeset/ports/545828 Log: - Fix dependency. - Fix a build breakage when -fno-common is specified. - Regenerate patch files. - Move the directory creation for DOCSDIR to pre-install. Added: head/x11-clocks/wmcalclock/files/patch-xutils.c (contents, props changed) head/x11-clocks/wmcalclock/files/patch-xutils.h (contents, props changed) Modified: head/x11-clocks/wmcalclock/Makefile head/x11-clocks/wmcalclock/files/patch-Makefile head/x11-clocks/wmcalclock/files/patch-wmCalClock.c Modified: head/x11-clocks/wmcalclock/Makefile ============================================================================== --- head/x11-clocks/wmcalclock/Makefile Sun Aug 23 16:05:35 2020 (r545827) +++ head/x11-clocks/wmcalclock/Makefile Sun Aug 23 16:08:43 2020 (r545828) @@ -3,7 +3,7 @@ PORTNAME= wmCalClock PORTVERSION= 1.26 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://jmpacquet.free.fr/wmcalclock/ @@ -14,16 +14,18 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING USES= xorg -USE_XORG= xpm +USE_XORG= x11 xext xpm WRKSRC= ${WRKDIR}/${DISTNAME}/Src PLIST_FILES= bin/wmCalClock man/man1/${PORTNAME}.1.gz PORTDOCS= BUGS CHANGES HINTS INSTALL README TODO OPTIONS_DEFINE= DOCS -post-install-DOCS-on: +pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-on: cd ${WRKDIR}/${DISTNAME} && \ - ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/x11-clocks/wmcalclock/files/patch-Makefile ============================================================================== --- head/x11-clocks/wmcalclock/files/patch-Makefile Sun Aug 23 16:05:35 2020 (r545827) +++ head/x11-clocks/wmcalclock/files/patch-Makefile Sun Aug 23 16:08:43 2020 (r545828) @@ -1,5 +1,5 @@ ---- Makefile.orig 1999-03-27 14:46:38.000000000 +0800 -+++ Makefile 2014-01-11 20:07:37.000000000 +0800 +--- Makefile.orig 1999-03-27 06:46:38 UTC ++++ Makefile @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -O2 -Wall Modified: head/x11-clocks/wmcalclock/files/patch-wmCalClock.c ============================================================================== --- head/x11-clocks/wmcalclock/files/patch-wmCalClock.c Sun Aug 23 16:05:35 2020 (r545827) +++ head/x11-clocks/wmcalclock/files/patch-wmCalClock.c Sun Aug 23 16:08:43 2020 (r545828) @@ -1,6 +1,6 @@ ---- wmCalClock.c.orig Wed May 21 03:34:04 2003 -+++ wmCalClock.c Wed May 21 03:34:07 2003 -@@ -299,7 +299,7 @@ +--- wmCalClock.c.orig 2002-10-06 07:51:10 UTC ++++ wmCalClock.c +@@ -330,7 +330,7 @@ int main(int argc, char *argv[]) { int i, n, wid, extrady, extradx; int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize; Added: head/x11-clocks/wmcalclock/files/patch-xutils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmcalclock/files/patch-xutils.c Sun Aug 23 16:08:43 2020 (r545828) @@ -0,0 +1,15 @@ +--- xutils.c.orig 1999-03-27 06:46:38 UTC ++++ xutils.c +@@ -39,7 +39,11 @@ + #include <X11/extensions/shape.h> + #include "xutils.h" + +- ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; + + /* + * X11 Variables Added: head/x11-clocks/wmcalclock/files/patch-xutils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmcalclock/files/patch-xutils.h Sun Aug 23 16:08:43 2020 (r545828) @@ -0,0 +1,19 @@ +--- xutils.h.orig 1999-03-27 06:46:38 UTC ++++ xutils.h +@@ -18,11 +18,11 @@ typedef struct { + /* + * Global variable + */ +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; ++extern Display *display; ++extern Window Root; ++extern Window iconwin, win; ++extern int screen; ++extern int DisplayDepth; + + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008231608.07NG8iBE039850>