Index: head/x11-wm/wmii-devel/Makefile =================================================================== --- head/x11-wm/wmii-devel/Makefile (revision 553912) +++ head/x11-wm/wmii-devel/Makefile (revision 553913) @@ -1,45 +1,45 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= wmii PORTVERSION= 3.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/wmii/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}+ixp-${PORTVERSION} MAINTAINER= rodrigo@FreeBSD.org COMMENT= Dynamic, minimalist window manager for X11 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libixp.so:devel/libixp CONFLICTS= wmii-[0-9]* USES= pkgconfig python:run shebangfix tar:tbz xorg SHEBANG_FILES= alternative_wmiircs/python/wmiirc USE_XORG= x11 xext xrandr xrender xinerama xft MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \ CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \ MAN="${MANPREFIX}/man" DOC="${DOCSDIR}" MAKE_ENV= noisycc=1 # unmute build commands, useful for logs OPTIONS_DEFINE= DOCS post-patch: # Link against `devel/libixp' from ports and drop extraneous build options @${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \ ${WRKSRC}/config.mk post-install: @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE .for f in bin/wimenu bin/wmii bin/wmii9menu bin/wmiir lib/libwmii_hack.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor .include Index: head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c =================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c (revision 553913) @@ -0,0 +1,10 @@ +--- cmd/wmii9menu.c.orig 2020-10-18 16:18:05 UTC ++++ cmd/wmii9menu.c +@@ -35,6 +35,7 @@ + * Heavily modified by Kris Maglione for use with wmii. + */ + ++#define EXTERN + #define IXP_NO_P9_ + #define IXP_P9_STRUCTS + #include Property changes on: head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h =================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h (revision 553913) @@ -0,0 +1,35 @@ +--- cmd/wmii/dat.h.orig 2020-10-18 11:55:59 UTC ++++ cmd/wmii/dat.h +@@ -358,7 +358,7 @@ EXTERN Divide* divs; + EXTERN Client c_magic; + EXTERN Client c_root; + +-EXTERN Handlers framehandler; ++extern Handlers framehandler; + + EXTERN char buffer[8092]; + EXTERN char* _buffer; +@@ -371,7 +371,7 @@ static char* const _buf_end = buffer + sizeof buffer; + + /* IXP */ + EXTERN IxpServer srv; +-EXTERN Ixp9Srv p9srv; ++extern Ixp9Srv p9srv; + + /* X11 */ + EXTERN uint valid_mask; +@@ -382,12 +382,12 @@ EXTERN Image* ibuf32; + EXTERN Cursor cursor[CurLast]; + + typedef void (*XHandler)(XEvent*); +-EXTERN XHandler handler[LASTEvent]; ++extern XHandler handler[LASTEvent]; + + /* Misc */ + EXTERN int starting; + EXTERN bool resizing; +-EXTERN long ignoreenter; ++extern long ignoreenter; + EXTERN char* user; + EXTERN char* execstr; + EXTERN int debugflag; Property changes on: head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c =================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c (revision 553913) @@ -0,0 +1,11 @@ +--- cmd/wmii/event.c.orig 2020-10-18 09:39:16 UTC ++++ cmd/wmii/event.c +@@ -5,6 +5,8 @@ + #include + #include "fns.h" + ++long ignoreenter; ++ + typedef void (*EvHandler)(XEvent*); + + void Property changes on: head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c =================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c (revision 553913) @@ -0,0 +1,10 @@ +--- cmd/wmiir.c.orig 2020-10-18 16:14:32 UTC ++++ cmd/wmiir.c +@@ -1,6 +1,7 @@ + /* Copyight ©2007-2010 Kris Maglione + * See LICENSE file for license details. + */ ++#define EXTERN + #define IXP_NO_P9_ + #define IXP_P9_STRUCTS + #include Property changes on: head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/wmii-devel/files/patch-include_ixp__local.h =================================================================== --- head/x11-wm/wmii-devel/files/patch-include_ixp__local.h (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-include_ixp__local.h (revision 553913) @@ -0,0 +1,15 @@ +--- include/ixp_local.h.orig 2020-10-18 08:53:49 UTC ++++ include/ixp_local.h +@@ -3,7 +3,11 @@ + #include + #include + +-char *argv0; ++#ifndef EXTERN ++# define EXTERN extern ++#endif ++ ++EXTERN char *argv0; + #define ARGBEGIN \ + int _argtmp=0, _inargv=0; char *_argv=nil; \ + if(!argv0) {argv0=*argv; argv++, argc--;} \ Property changes on: head/x11-wm/wmii-devel/files/patch-include_ixp__local.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/wmii-devel/files/patch-include_util.h =================================================================== --- head/x11-wm/wmii-devel/files/patch-include_util.h (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-include_util.h (revision 553913) @@ -0,0 +1,22 @@ +--- include/util.h.orig 2010-06-10 07:24:03 UTC ++++ include/util.h +@@ -4,6 +4,10 @@ + #define nil ((void*)0) + #define nelem(ary) (sizeof(ary) / sizeof(*ary)) + ++#ifndef EXTERN ++# define EXTERN extern ++#endif ++ + /* Types */ + #undef uchar + #undef ushort +@@ -55,7 +59,7 @@ char* vsxprint(const char*, va_list); + #define die(...) \ + _die(__FILE__, __LINE__, __VA_ARGS__) + +-char *argv0; ++EXTERN char *argv0; + #undef ARGBEGIN + #undef ARGEND + #undef ARGF Property changes on: head/x11-wm/wmii-devel/files/patch-include_util.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/wmii-devel/files/patch-include_x11.h =================================================================== --- head/x11-wm/wmii-devel/files/patch-include_x11.h (nonexistent) +++ head/x11-wm/wmii-devel/files/patch-include_x11.h (revision 553913) @@ -0,0 +1,24 @@ +--- include/x11.h.orig 2020-10-18 08:56:29 UTC ++++ include/x11.h +@@ -17,6 +17,10 @@ + #undef Font + #undef Screen + ++#ifndef EXTERN ++# define EXTERN extern ++#endif ++ + enum Align { + North = 0x01, + East = 0x02, +@@ -182,8 +186,8 @@ struct Screen { + # pragma varargck type "W" Window* + #endif + +-Display *display; +-Screen scr; ++EXTERN Display *display; ++EXTERN Screen scr; + + extern const Point ZP; + extern const Rectangle ZR; Property changes on: head/x11-wm/wmii-devel/files/patch-include_x11.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property