svn commit: r564885 - in head/misc/wmwork: . files

[Alexey Dokuchaev]

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 at 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 <bsd.port.mk>

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