From owner-svn-ports-all@freebsd.org Wed Feb 10 17:18:35 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 36CED54D5C6; Wed, 10 Feb 2021 17:18:35 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbRLM17r1z4n8T; Wed, 10 Feb 2021 17:18:35 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A2C721A14; Wed, 10 Feb 2021 17:18:35 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11AHIYaY051435; Wed, 10 Feb 2021 17:18:34 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11AHIYus051432; Wed, 10 Feb 2021 17:18:34 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102101718.11AHIYus051432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 10 Feb 2021 17:18:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564885 - in head/misc/wmwork: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/misc/wmwork: . files X-SVN-Commit-Revision: 564885 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2021 17:18:35 -0000 Author: danfe Date: Wed Feb 10 17:18:34 2021 New Revision: 564885 URL: https://svnweb.freebsd.org/changeset/ports/564885 Log: - Unbreak the build against modern compilers (-fno-common) - Define LICENSE, convert to USES+=localbase and WRKSRC_SUBDIR - Install provided documentation files, amend USE_XORG list Added: head/misc/wmwork/files/patch-wmgeneral.c (contents, props changed) head/misc/wmwork/files/patch-wmgeneral.h (contents, props changed) Modified: head/misc/wmwork/Makefile Modified: head/misc/wmwork/Makefile ============================================================================== --- head/misc/wmwork/Makefile Wed Feb 10 17:18:24 2021 (r564884) +++ head/misc/wmwork/Makefile Wed Feb 10 17:18:34 2021 (r564885) @@ -11,22 +11,24 @@ MASTER_SITES= http://people.debian.org/~godisch/wmwork MAINTAINER= xride@FreeBSD.org COMMENT= Dockapp that keeps track of time you have spent on something -BROKEN_FreeBSD_13= duplicate symbol: display -BROKEN_FreeBSD_14= duplicate symbol: display +LICENSE= GPLv2 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src - -USES= gmake xorg -USE_XORG= xpm +USES= gmake localbase xorg +USE_XORG= x11 xext xpm GNU_CONFIGURE= yes +WRKSRC_SUBDIR= src PLIST_FILES= bin/wmwork man/man1/wmwork.1.gz +PORTDOCS= CHANGES README -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmwork ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/wmwork.1 ${STAGEDIR}${MANPREFIX}/man/man1 + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR} .include Added: head/misc/wmwork/files/patch-wmgeneral.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/wmwork/files/patch-wmgeneral.c Wed Feb 10 17:18:34 2021 (r564885) @@ -0,0 +1,10 @@ +--- wmgeneral.c.orig 2002-10-17 19:12:33 UTC ++++ wmgeneral.c +@@ -74,6 +74,7 @@ + /* X11 Variables */ + /*****************/ + ++Display *display; + Window Root; + int screen; + int x_fd; Added: head/misc/wmwork/files/patch-wmgeneral.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/wmwork/files/patch-wmgeneral.h Wed Feb 10 17:18:34 2021 (r564885) @@ -0,0 +1,11 @@ +--- wmgeneral.h.orig 2002-10-17 19:12:33 UTC ++++ wmgeneral.h +@@ -36,7 +36,7 @@ typedef struct { + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */