diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-02-10 17:18:34 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-02-10 17:18:34 +0000 |
| commit | 03aa5b7062d506f524637aec3a5610200b9f86e4 (patch) | |
| tree | da3baa0642ccd9b6c1a134b07984f5c1f830e5d1 /misc/wmwork | |
| parent | 0b9cfb9ec8bb35b5672dd274d3da2f4522475ece (diff) | |
| download | ports-03aa5b7062d506f524637aec3a5610200b9f86e4.tar.gz ports-03aa5b7062d506f524637aec3a5610200b9f86e4.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=564885
Diffstat (limited to 'misc/wmwork')
| -rw-r--r-- | misc/wmwork/Makefile | 18 | ||||
| -rw-r--r-- | misc/wmwork/files/patch-wmgeneral.c | 10 | ||||
| -rw-r--r-- | misc/wmwork/files/patch-wmgeneral.h | 11 |
3 files changed, 31 insertions, 8 deletions
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile index 98dca77adbf0..e999f53405e4 100644 --- a/misc/wmwork/Makefile +++ b/misc/wmwork/Makefile @@ -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 <bsd.port.mk> diff --git a/misc/wmwork/files/patch-wmgeneral.c b/misc/wmwork/files/patch-wmgeneral.c new file mode 100644 index 000000000000..567bc562cfda --- /dev/null +++ b/misc/wmwork/files/patch-wmgeneral.c @@ -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; diff --git a/misc/wmwork/files/patch-wmgeneral.h b/misc/wmwork/files/patch-wmgeneral.h new file mode 100644 index 000000000000..e51a1eb38455 --- /dev/null +++ b/misc/wmwork/files/patch-wmgeneral.h @@ -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 */ |