Attachment #222263 for bug #253346

Lines 1483-1488 Link Here

(-)sysutils/Makefile (+1 lines)
1483	SUBDIR += wmflame	1483	SUBDIR += wmflame
1484	SUBDIR += wmmemfree	1484	SUBDIR += wmmemfree
1485	SUBDIR += wmmemload	1485	SUBDIR += wmmemload
		1486	SUBDIR += wmscript
1486	SUBDIR += wmtop	1487	SUBDIR += wmtop
1487	SUBDIR += wmupmon	1488	SUBDIR += wmupmon
1488	SUBDIR += worldtools	1489	SUBDIR += worldtools




# 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>

Line 0 Link Here

(-)sysutils/wmscript/distinfo (+3 lines)
	1	TIMESTAMP = 1612783763
	2	SHA256 (wmscript-1.0.tar.gz) = 11f7fcd03ab2eecafd09500dd42124f67229061043acbbe8b589bdd1fdec4a97
	3	SIZE (wmscript-1.0.tar.gz) = 22914




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




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

Line 0 Link Here

(-)sysutils/wmscript/files/patch-wmscript_wmscript.c (+10 lines)
	1	--- wmscript/wmscript.c.orig 2000-01-16 13:28:42 UTC
	2	+++ wmscript/wmscript.c
	3	@@ -31,7 +31,6 @@
	4	#include <sys/ioctl.h>
	5	#include <sys/socket.h>
	6
	7	-#include <utmp.h>
	8	#include <dirent.h>
	9
	10	#include <X11/Xlib.h>

Line 0 Link Here

(-)sysutils/wmscript/pkg-descr (+8 lines)
	1	WMScript is a system monitoring dock app for Window Maker.
	2	It allows you to specify a command and have the numeric result of that command
	3	displayed in the dock app's window. You may specify up to 5 things to monitor
	4	and the interval is configurable.
	5	This combines to make it a very flexible tool for system monitoring.
	6	It is based on WMiNet, and the look is the same.
	7
	8	WWW: http://freshmeat.sourceforge.net/projects/wmscript

Line 0 Link Here

(-)sysutils/wmscript/pkg-plist (+5 lines)
	1	bin/wmscript
	2	%%PORTDOCS%%%%DOCSDIR%%/README
	3	%%PORTDOCS%%%%DOCSDIR%%/HINTS
	4	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmscriptrc.example
	5

Return to bug 253346

Line 0 Link Here

(-)sysutils/wmscript/Makefile (+38 lines)
	1	# Created by: Igor Pokrovsky <ip@unixway.org>
	2	# $FreeBSD$
	3
	4	PORTNAME= wmscript
	5	DISTVERSION= 1.0
	6	CATEGORIES= sysutils windowmaker
	7	MASTER_SITES= http://krapplets.cream.org/linux/
	8
	9	MAINTAINER= ip@unixway.org
	10	COMMENT= System monitoring dockapp for Window Maker
	11
	12	LICENSE= GPLv2
	13	LICENSE_FILE= ${WRKSRC}/COPYING
	14
	15	USES= gmake xorg
	16	USE_XORG= x11 xext xpm
	17
	18	WRKSRC= ${WRKDIR}/${PORTNAME}.app
	19	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
	20
	21	OPTIONS_DEFINE= DOCS EXAMPLES
	22
	23	post-patch:
	24	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${BUILD_WRKSRC}/Makefile
	25
	26	do-install:
	27	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	28
	29	do-install-EXAMPLES-on:
	30	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	31	${INSTALL_DATA} ${BUILD_WRKSRC}/${PORTNAME}rc.example ${STAGEDIR}${EXAMPLESDIR}
	32
	33	do-install-DOCS-on:
	34	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	35	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
	36	${INSTALL_DATA} ${WRKSRC}/HINTS ${STAGEDIR}${DOCSDIR}
	37
	38	.include <bsd.port.mk>

Line 0 Link Here

(-)sysutils/wmscript/files/patch-wmgeneral_list.h (+31 lines)
	1	--- wmgeneral/list.h.orig 1998-11-14 22:36:10 UTC
	2	+++ wmgeneral/list.h
	3	@@ -40,20 +40,20 @@ typedef struct LinkedList {
	4	struct LinkedList *tail;
	5	} LinkedList;
	6
	7	-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
	8	+extern INLINE LinkedList* list_cons(void* head, LinkedList* tail);
	9
	10	-INLINE int list_length(LinkedList* list);
	11	+extern INLINE int list_length(LinkedList* list);
	12
	13	-INLINE void* list_nth(int index, LinkedList* list);
	14	+extern INLINE void* list_nth(int index, LinkedList* list);
	15
	16	-INLINE void list_remove_head(LinkedList** list);
	17	+extern INLINE void list_remove_head(LinkedList** list);
	18
	19	-INLINE LinkedList list_remove_elem(LinkedList list, void* elem);
	20	+extern INLINE LinkedList list_remove_elem(LinkedList list, void* elem);
	21
	22	-INLINE void list_mapcar(LinkedList* list, void(function)(void));
	23	+extern INLINE void list_mapcar(LinkedList* list, void(function)(void));
	24
	25	-INLINE LinkedListlist_find(LinkedList list, void* elem);
	26	+extern INLINE LinkedListlist_find(LinkedList list, void* elem);
	27
	28	-INLINE void list_free(LinkedList* list);
	29	+extern INLINE void list_free(LinkedList* list);
	30
	31	#endif

Line 0 Link Here

(-)sysutils/wmscript/files/patch-wmscript_Makefile (+25 lines)
	1	--- wmscript/Makefile.orig 2000-01-16 13:27:20 UTC
	2	+++ wmscript/Makefile
	3	@@ -1,6 +1,7 @@
	4	-LIBDIR = -L/usr/X11R6/lib
	5	+CC?= cc
	6	+LIBDIR = -L%%LOCALBASE%%/lib
	7	LIBS = -lXpm -lXext -lX11
	8	-FLAGS = -O2
	9	+CFLAGS += -O2
	10	OBJS = wmscript.o \
	11	../wmgeneral/wmgeneral.o \
	12	../wmgeneral/misc.o \
	13	@@ -8,10 +9,10 @@ OBJS = wmscript.o \
	14
	15
	16	.c.o:
	17	- cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
	18	+ $(CC) -I%%LOCALBASE%%/include $(CFLAGS) -c -Wall $< -o $*.o
	19
	20	wmscript: $(OBJS)
	21	- cc $(FLAGS) -o wmscript $^ -lXext $(LIBDIR) $(LIBS)
	22	+ $(CC) -o wmscript $^ -lXext $(LIBDIR) $(LIBS)
	23
	24	all:: wmscript
	25