Attachment 222300 Details for Bug 253346 – Diff file

[patch] Diff file

wmscript.diff (text/plain), 9.82 KB, created by Igor Pokrovsky on 2021-02-09 17:46:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Pokrovsky

Created: 2021-02-09 17:46:19 UTC

Size: 9.82 KB

patch

obsolete

>Index: sysutils/Makefile
>===================================================================
>--- sysutils/Makefile	(revision 564618)
>+++ sysutils/Makefile	(working copy)
>@@ -1483,6 +1483,7 @@
>     SUBDIR += wmflame
>     SUBDIR += wmmemfree
>     SUBDIR += wmmemload
>+    SUBDIR += wmscript
>     SUBDIR += wmtop
>     SUBDIR += wmupmon
>     SUBDIR += worldtools
>Index: sysutils/wmscript/Makefile
>===================================================================
>--- sysutils/wmscript/Makefile	(nonexistent)
>+++ sysutils/wmscript/Makefile	(working copy)
>@@ -0,0 +1,38 @@
>+# Created by: Igor Pokrovsky <ip@unixway.org>
>+# $FreeBSD$
>+
>+PORTNAME=	wmscript
>+DISTVERSION=	1.0
>+CATEGORIES=	sysutils windowmaker
>+MASTER_SITES=	http://krapplets.cream.org/linux/
>+
>+MAINTAINER=	ip@unixway.org
>+COMMENT=	System monitoring dockapp for Window Maker
>+
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+USES=		gmake xorg
>+USE_XORG=	x11 xext xpm
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}.app
>+BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
>+
>+OPTIONS_DEFINE=	DOCS EXAMPLES
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${BUILD_WRKSRC}/Makefile
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>+
>+do-install-EXAMPLES-on:
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${BUILD_WRKSRC}/${PORTNAME}rc.example ${STAGEDIR}${EXAMPLESDIR}
>+
>+do-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/HINTS ${STAGEDIR}${DOCSDIR}
>+
>+.include <bsd.port.mk>
>
>Property changes on: sysutils/wmscript/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/wmscript/distinfo
>===================================================================
>--- sysutils/wmscript/distinfo	(nonexistent)
>+++ sysutils/wmscript/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1612783763
>+SHA256 (wmscript-1.0.tar.gz) = 11f7fcd03ab2eecafd09500dd42124f67229061043acbbe8b589bdd1fdec4a97
>+SIZE (wmscript-1.0.tar.gz) = 22914
>
>Property changes on: sysutils/wmscript/distinfo
>___________________________________________________________________
>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: sysutils/wmscript/files/patch-wmgeneral_list.h
>===================================================================
>--- sysutils/wmscript/files/patch-wmgeneral_list.h	(nonexistent)
>+++ sysutils/wmscript/files/patch-wmgeneral_list.h	(working copy)
>@@ -0,0 +1,31 @@
>+--- wmgeneral/list.h.orig	1998-11-14 22:36:10 UTC
>++++ wmgeneral/list.h
>+@@ -40,20 +40,20 @@ typedef struct LinkedList {
>+   struct LinkedList *tail;
>+ } LinkedList;
>+ 
>+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
>++extern INLINE LinkedList* list_cons(void* head, LinkedList* tail);
>+ 
>+-INLINE int list_length(LinkedList* list);
>++extern INLINE int list_length(LinkedList* list);
>+ 
>+-INLINE void* list_nth(int index, LinkedList* list);
>++extern INLINE void* list_nth(int index, LinkedList* list);
>+ 
>+-INLINE void list_remove_head(LinkedList** list);
>++extern INLINE void list_remove_head(LinkedList** list);
>+ 
>+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
>++extern INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
>+ 
>+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
>++extern INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
>+ 
>+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
>++extern INLINE LinkedList*list_find(LinkedList* list, void* elem);
>+ 
>+-INLINE void list_free(LinkedList* list);
>++extern INLINE void list_free(LinkedList* list);
>+ 
>+ #endif
>
>Property changes on: sysutils/wmscript/files/patch-wmgeneral_list.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: sysutils/wmscript/files/patch-wmgeneral_wmgeneral.c
>===================================================================
>--- sysutils/wmscript/files/patch-wmgeneral_wmgeneral.c	(nonexistent)
>+++ sysutils/wmscript/files/patch-wmgeneral_wmgeneral.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- wmgeneral/wmgeneral.c.orig	2021-02-09 17:08:45 UTC
>++++ wmgeneral/wmgeneral.c
>+@@ -55,6 +55,8 @@
>+  /* X11 Variables */
>+ /*****************/
>+ 
>++Display		*display;
>++
>+ Window		Root;
>+ int			screen;
>+ int			x_fd;
>
>Property changes on: sysutils/wmscript/files/patch-wmgeneral_wmgeneral.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: sysutils/wmscript/files/patch-wmgeneral_wmgeneral.h
>===================================================================
>--- sysutils/wmscript/files/patch-wmgeneral_wmgeneral.h	(nonexistent)
>+++ sysutils/wmscript/files/patch-wmgeneral_wmgeneral.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- wmgeneral/wmgeneral.h.orig	2021-02-09 17:07:55 UTC
>++++ wmgeneral/wmgeneral.h
>+@@ -36,7 +36,7 @@ typedef struct {
>+  /* Global variable */
>+ /*******************/
>+ 
>+-Display		*display;
>++extern Display		*display;
>+ 
>+   /***********************/
>+  /* Function Prototypes */
>
>Property changes on: sysutils/wmscript/files/patch-wmgeneral_wmgeneral.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: sysutils/wmscript/files/patch-wmscript_Makefile
>===================================================================
>--- sysutils/wmscript/files/patch-wmscript_Makefile	(nonexistent)
>+++ sysutils/wmscript/files/patch-wmscript_Makefile	(working copy)
>@@ -0,0 +1,25 @@
>+--- wmscript/Makefile.orig	2000-01-16 13:27:20 UTC
>++++ wmscript/Makefile
>+@@ -1,6 +1,7 @@
>+-LIBDIR = -L/usr/X11R6/lib
>++CC?=	cc
>++LIBDIR = -L%%LOCALBASE%%/lib
>+ LIBS   = -lXpm -lXext -lX11
>+-FLAGS = -O2
>++CFLAGS += -O2
>+ OBJS =	wmscript.o \
>+ 		../wmgeneral/wmgeneral.o \
>+ 		../wmgeneral/misc.o \
>+@@ -8,10 +9,10 @@ OBJS =	wmscript.o \
>+ 
>+ 
>+ .c.o:
>+-	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
>++	$(CC) -I%%LOCALBASE%%/include $(CFLAGS) -c -Wall $< -o $*.o
>+ 
>+ wmscript: $(OBJS)
>+-	cc $(FLAGS) -o wmscript $^ -lXext $(LIBDIR) $(LIBS)
>++	$(CC) -o wmscript $^ -lXext $(LIBDIR) $(LIBS)
>+ 
>+ all:: wmscript
>+ 
>
>Property changes on: sysutils/wmscript/files/patch-wmscript_Makefile
>___________________________________________________________________
>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: sysutils/wmscript/files/patch-wmscript_wmscript.c
>===================================================================
>--- sysutils/wmscript/files/patch-wmscript_wmscript.c	(nonexistent)
>+++ sysutils/wmscript/files/patch-wmscript_wmscript.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- wmscript/wmscript.c.orig	2000-01-16 13:28:42 UTC
>++++ wmscript/wmscript.c
>+@@ -31,7 +31,6 @@
>+ #include <sys/ioctl.h>
>+ #include <sys/socket.h>
>+ 
>+-#include <utmp.h>
>+ #include <dirent.h>
>+ 
>+ #include <X11/Xlib.h>
>
>Property changes on: sysutils/wmscript/files/patch-wmscript_wmscript.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: sysutils/wmscript/pkg-descr
>===================================================================
>--- sysutils/wmscript/pkg-descr	(nonexistent)
>+++ sysutils/wmscript/pkg-descr	(working copy)
>@@ -0,0 +1,8 @@
>+WMScript is a system monitoring dock app for Window Maker.
>+It allows you to specify a command and have the numeric result of that command
>+displayed in the dock app's window. You may specify up to 5 things to monitor
>+and the interval is configurable.
>+This combines to make it a very flexible tool for system monitoring.
>+It is based on WMiNet, and the look is the same.
>+
>+WWW: http://freshmeat.sourceforge.net/projects/wmscript
>
>Property changes on: sysutils/wmscript/pkg-descr
>___________________________________________________________________
>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: sysutils/wmscript/pkg-plist
>===================================================================
>--- sysutils/wmscript/pkg-plist	(nonexistent)
>+++ sysutils/wmscript/pkg-plist	(working copy)
>@@ -0,0 +1,5 @@
>+bin/wmscript
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/HINTS
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmscriptrc.example
>+
>
>Property changes on: sysutils/wmscript/pkg-plist
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 253346: 222263 | 222300