Attachment #176357 for bug #213190





PORTNAME=	euclid-wm
PORTVERSION=	0.4.3
PORTREVISION=	1
CATEGORIES=	x11-wm
#MASTER_SITES=	http://euclid-wm.googlecode.com/files/
MASTER_SITES=	GOOGLE_CODE

MAINTAINER=	anastasios@mageirias.com
COMMENT=	Minimalist, tiling window manager for X11

LICENSE=	BSD3CLAUSE

USE_GITHUB=	yes
GH_ACCOUNT=	wmdiem
GH_PROJECT=	euclid-wm
GH_TAGNAME=	b6b0319

OPTIONS_DEFINE=		XINERAMA EUCLID_MENU
OPTIONS_SUB=		yes
OPTIONS_DEFAULT=	XINERAMA
XINERAMA_DESC=		X11 Xinerama extension support
EUCLID_MENU_DESC=	Custom built menuing program (work in progress)

ALL_TARGET=		noxinerama
XINERAMA_ALL_TARGET=	euclid-wm
EUCLID_MENU_ALL_TARGET=	euclid-menu
XINERAMA_USE=		XORG=xinerama

USES=		gmake
USE_XORG=	x11

PLIST_FILES=	bin/euclid-wm \
		bin/start-euclid \
		man/man1/euclid-wm.1.gz \
		share/xsessions/euclid.desktop \
		%%DATADIR%%/VERSION \
		%%DATADIR%%/euclid-wm.conf \
		%%DATADIR%%/euclidrc \
		%%EUCLID_MENU%%bin/euclid-menu \
		%%EUCLID_MENU%%share/euclid-menu/handlers/.echo_file.sh \
		%%EUCLID_MENU%%share/euclid-menu/handlers/c.sh \
		%%EUCLID_MENU%%share/euclid-menu/handlers/default.sh

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-wm

post-install-EUCLID_MENU-on:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-menu

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (euclid-wm-0.4.3.tar.gz) = 7498215584aabe3e035adc42fb3daa5b85d53e5a61836523eb670a1a724158db	1	TIMESTAMP = 1475169953
2	SIZE (euclid-wm-0.4.3.tar.gz) = 23871	2	SHA256 (wmdiem-euclid-wm-0.4.3-b6b0319_GH0.tar.gz) = 1941c0a2522bf5bd22daf920babf45bd8ad039b63751c7e1a0203cc05f72e93e
		3	SIZE (wmdiem-euclid-wm-0.4.3-b6b0319_GH0.tar.gz) = 35476




--- Makefile.orig	2015-09-06 19:45:03 UTC
+++ Makefile
@@ -1,6 +1,6 @@
-PREFIX    = usr

-MANDIR    = ${SHAREDIR}/man
+MANDIR    = ${PREFIX}/man
 BINDIR    = ${PREFIX}/bin
 SVNREV 	  = 224 
 VER	  = 0.4.3
@@ -13,7 +13,7 @@ endif
 CONFDIR = ${XDG_CONFIG_HOME}/euclid-wm
 
 CC = cc -pedantic -Wall 
-CFLAGS = -O3 -g -std=c99 
+CFLAGS = -O3 -g -std=c99 -I/usr/local/include -L/usr/local/lib 
 LDFLAGS = -lX11 -lXinerama
 
 .PHONY: all install install_conf clean uninstall dist dist_clean
@@ -31,19 +31,34 @@ noxinerama: euclid-wm.c
-all: euclid-wm
+all: noxinerama
 
 euclid-wm: euclid-wm.c
 	${CC} $< ${LDFLAGS} ${CFLAGS} -o $@
@@ -28,14 +28,23 @@ noxinerama: euclid-wm.c
 	cp noxinerama euclid-wm
 
 install: all

-	@install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf
-	@install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
-	@install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null || echo "From SVN: `svn info | grep Revision: | cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
-	@sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local
-	@install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid
-	@install -m755 euclid-menu -D ${DESTDIR}/${BINDIR}/euclid-menu
-	@install -m755 ./handlers/c.sh -D  ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
-	@install -m755 ./handlers/default.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
-	@install -m755 ./handlers/.echo_file.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
-
+#	@install -m755 euclid-wm -D ${DESTDIR}/${BINDIR}/euclid-wm
+	@cp -f euclid-wm ${DESTDIR}/${BINDIR}/euclid-wm
+#	@install -m644 euclid.desktop -D ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
+	@mkdir -p ${DESTDIR}/${SHAREDIR}/xsessions
+	@cp -f euclid.desktop ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
+#	@install -m644 euclid.1 -D ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
+	@cp -f euclid.1 ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
+#	@install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf

+#	@install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
+	@cp -f euclidrc ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
+#	@install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null || echo "From SVN: `svn info | grep Revision: | cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
+	@echo ${VER}" "${SVNREV} > ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
+#	@cp -f VERSION ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
+#	@sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local
+	@sed 's /usr/share /${SHAREDIR} ' <start-euclid >start-euclid-local
+#	@install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid
+	@cp -f start-euclid-local ${DESTDIR}/${BINDIR}/start-euclid
+#	@install -m755 euclid-menu -D ${DESTDIR}/${BINDIR}/euclid-menu
+	@cp -f euclid-menu ${DESTDIR}/${BINDIR}/euclid-menu
+#	@install -m755 ./handlers/c.sh -D  ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
+	@mkdir -p ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers
+	@cp -f ./handlers/c.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
+#	@install -m755 ./handlers/default.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
+	@cp -f ./handlers/default.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
+#	@install -m755 ./handlers/.echo_file.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
+	@cp -f ./handlers/.echo_file.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
 
 
 install_conf:
 	@install -b -D -m600 euclid-wm.conf.sample ${CONFDIR}/euclid-wm.conf




--- euclid-wm.c.orig	2015-09-06 19:45:03 UTC
+++ euclid-wm.c
@@ -93,9 +93,11 @@ Thus the one or more of the following no
 
 
 //this is a hack
-FILE *popen(char *, char *);
+//FILE *popen(char *, char *);
+FILE *popen(const char *, const char *);
 int pclose (FILE *);
-char *tempnam(char *,char*);
+//char *tempnam(char *,char*);
+char *tempnam(const char *, const char *);
 
 //determines size of a static array (won't work with pointers)
 #define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))

Lines 6-9 Link Here

(-)pkg-descr (+1 lines)
6	or fixed layouts with the flexibility of those dynamic layouts,	6	or fixed layouts with the flexibility of those dynamic layouts,
7	- create an easy way to manage minimized windows	7	- create an easy way to manage minimized windows
8		8
		9	WWW: https://github.com/wmdiem/euclid-wm
9	WWW: http://euclid-wm.sourceforge.net	10	WWW: http://euclid-wm.sourceforge.net

Return to bug 213190

Lines 2-37 Link Here

(-)Makefile (-13 / +26 lines)
2		2
3	PORTNAME= euclid-wm	3	PORTNAME= euclid-wm
4	PORTVERSION= 0.4.3	4	PORTVERSION= 0.4.3
		5	PORTREVISION= 1
5	CATEGORIES= x11-wm	6	CATEGORIES= x11-wm
6	#MASTER_SITES= http://euclid-wm.googlecode.com/files/
7	MASTER_SITES= GOOGLE_CODE
8		7
9	MAINTAINER= anastmag@gmail.com	8	MAINTAINER= anastasios@mageirias.com
10	COMMENT= Minimalist, tiling window manager for X11	9	COMMENT= Minimalist, tiling window manager for X11
11		10
12	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
13		12
14	BROKEN= Unfetchable (google code has gone away)	13	USE_GITHUB= yes
		14	GH_ACCOUNT= wmdiem
		15	GH_PROJECT= euclid-wm
		16	GH_TAGNAME= b6b0319
15		17
16	OPTIONS_DEFINE= XINERAMA	18	OPTIONS_DEFINE= XINERAMA EUCLID_MENU
17	XINERAMA_DESC= X11 Xinerama extention support	19	OPTIONS_SUB= yes
18	OPTIONS_DEFAULT=XINERAMA	20	OPTIONS_DEFAULT= XINERAMA
		21	XINERAMA_DESC= X11 Xinerama extension support
		22	EUCLID_MENU_DESC= Custom built menuing program (work in progress)
19		23
		24	ALL_TARGET= noxinerama
20	XINERAMA_ALL_TARGET= euclid-wm	25	XINERAMA_ALL_TARGET= euclid-wm
21	XINERAMA_USE= XORG=xinerama	26	EUCLID_MENU_ALL_TARGET= euclid-menu
		27	XINERAMA_USE= XORG=xinerama
22		28
23	USES= gmake	29	USES= gmake
24	USE_XORG= x11	30	USE_XORG= x11
25		31
26	PLIST_FILES= bin/euclid-wm \	32	PLIST_FILES= bin/euclid-wm \
27	bin/start-euclid \	33	bin/start-euclid \
28	man/man1/euclid-wm.1.gz \	34	man/man1/euclid-wm.1.gz \
29	share/euclid-wm/euclid-wm.conf \	35	share/xsessions/euclid.desktop \
30	share/euclid-wm/euclidrc \	36	%%DATADIR%%/VERSION \
31	share/euclid-wm/VERSION \	37	%%DATADIR%%/euclid-wm.conf \
32	share/xsessions/euclid.desktop	38	%%DATADIR%%/euclidrc \
		39	%%EUCLID_MENU%%bin/euclid-menu \
		40	%%EUCLID_MENU%%share/euclid-menu/handlers/.echo_file.sh \
		41	%%EUCLID_MENU%%share/euclid-menu/handlers/c.sh \
		42	%%EUCLID_MENU%%share/euclid-menu/handlers/default.sh
33		43
34	post-install:	44	post-install:
35	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-wm	45	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-wm
36		46
		47	post-install-EUCLID_MENU-on:
		48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-menu
		49
37	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)files/patch-Makefile (-18 / +29 lines)
1	--- Makefile.orig 2013-12-16 15:18:31 UTC	1	--- Makefile.orig 2015-09-06 19:45:03 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	-PREFIX = usr	4	-PREFIX = usr
Lines 7-30 Link Here
7	-MANDIR = ${SHAREDIR}/man	7	-MANDIR = ${SHAREDIR}/man
8	+MANDIR = ${PREFIX}/man	8	+MANDIR = ${PREFIX}/man
9	BINDIR = ${PREFIX}/bin	9	BINDIR = ${PREFIX}/bin
10	SVNREV = 222	10	SVNREV = 224
11	VER = 0.4.2	11	VER = 0.4.3
12	@@ -13,12 +13,12 @@ endif	12	@@ -13,7 +13,7 @@ endif
13	CONFDIR = ${XDG_CONFIG_HOME}/euclid-wm	13	CONFDIR = ${XDG_CONFIG_HOME}/euclid-wm
14		14
15	CC = cc -pedantic -Wall	15	CC = cc -pedantic -Wall
16	-CFLAGS = -O2 -g -std=c99	16	-CFLAGS = -O3 -g -std=c99
17	+CFLAGS = -O2 -g -std=c99 -I/usr/local/include -L/usr/local/lib	17	+CFLAGS = -O3 -g -std=c99 -I/usr/local/include -L/usr/local/lib
18	LDFLAGS = -lX11 -lXinerama	18	LDFLAGS = -lX11 -lXinerama
19		19
20	.PHONY: all install install_conf clean uninstall dist dist_clean	20	.PHONY: all install install_conf clean uninstall dist dist_clean
21		21	@@ -31,19 +31,34 @@ noxinerama: euclid-wm.c
22	-all: euclid-wm
23	+all: noxinerama
24
25	euclid-wm: euclid-wm.c
26	${CC} $< ${LDFLAGS} ${CFLAGS} -o $@
27	@@ -28,14 +28,23 @@ noxinerama: euclid-wm.c
28	cp noxinerama euclid-wm	22	cp noxinerama euclid-wm
29		23
30	install: all	24	install: all
Lines 34-44 Link Here
34	- @install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf	28	- @install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf
35	- @install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc	29	- @install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
36	- @install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null \|\| echo "From SVN: `svn info \| grep Revision: \| cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION	30	- @install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null \|\| echo "From SVN: `svn info \| grep Revision: \| cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
		31	- @sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local
		32	- @install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid
		33	- @install -m755 euclid-menu -D ${DESTDIR}/${BINDIR}/euclid-menu
		34	- @install -m755 ./handlers/c.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
		35	- @install -m755 ./handlers/default.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
		36	- @install -m755 ./handlers/.echo_file.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
		37	-
37	+# @install -m755 euclid-wm -D ${DESTDIR}/${BINDIR}/euclid-wm	38	+# @install -m755 euclid-wm -D ${DESTDIR}/${BINDIR}/euclid-wm
38	+ @cp -f euclid-wm ${DESTDIR}/${BINDIR}/euclid-wm	39	+ @cp -f euclid-wm ${DESTDIR}/${BINDIR}/euclid-wm
39	+# @install -m644 euclid.desktop -D ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop	40	+# @install -m644 euclid.desktop -D ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
40	+ @mkdir -p ${DESTDIR}/${SHAREDIR}/xsessions	41	+ @mkdir -p ${DESTDIR}/${SHAREDIR}/xsessions
41	+ @cp -f euclid.desktop ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop	42	+ @cp -f euclid.desktop ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
42	+# @install -m644 euclid.1 -D ${DESTDIR}/${MANDIR}/man1/euclid-wm.1	43	+# @install -m644 euclid.1 -D ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
43	+ @cp -f euclid.1 ${DESTDIR}/${MANDIR}/man1/euclid-wm.1	44	+ @cp -f euclid.1 ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
44	+# @install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf	45	+# @install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf
Lines 47-57 Link Here
47	+# @install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc	48	+# @install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
48	+ @cp -f euclidrc ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc	49	+ @cp -f euclidrc ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
49	+# @install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null \|\| echo "From SVN: `svn info \| grep Revision: \| cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION	50	+# @install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null \|\| echo "From SVN: `svn info \| grep Revision: \| cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
50	+ @cp -f VERSION ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION	51	+ @echo ${VER}" "${SVNREV} > ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
51	@sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local	52	+# @cp -f VERSION ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
52	- @install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid	53	+# @sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local
		54	+ @sed 's /usr/share /${SHAREDIR} ' <start-euclid >start-euclid-local
53	+# @install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid	55	+# @install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid
54	+ @cp -f start-euclid-local ${DESTDIR}/${BINDIR}/start-euclid	56	+ @cp -f start-euclid-local ${DESTDIR}/${BINDIR}/start-euclid
		57	+# @install -m755 euclid-menu -D ${DESTDIR}/${BINDIR}/euclid-menu
		58	+ @cp -f euclid-menu ${DESTDIR}/${BINDIR}/euclid-menu
		59	+# @install -m755 ./handlers/c.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
		60	+ @mkdir -p ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers
		61	+ @cp -f ./handlers/c.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
		62	+# @install -m755 ./handlers/default.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
		63	+ @cp -f ./handlers/default.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
		64	+# @install -m755 ./handlers/.echo_file.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
		65	+ @cp -f ./handlers/.echo_file.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
55		66
		67
56	install_conf:	68	install_conf:
57	@install -b -D -m600 euclid-wm.conf.sample ${CONFDIR}/euclid-wm.conf

Lines 1-14 Link Here

(-)files/patch-euclid-wm.c (-6 / +8 lines)
1	--- euclid-wm.c.orig 2013-12-16 15:18:31 UTC	1	--- euclid-wm.c.orig 2015-09-06 19:45:03 UTC
2	+++ euclid-wm.c	2	+++ euclid-wm.c
3	@@ -93,9 +93,9 @@ Thus the one or more of the following no	3	@@ -93,9 +93,11 @@ Thus the one or more of the following no
4		4
5		5
6	//this is a hack	6	//this is a hack
7	-FILE popen(char , char *);	7	-FILE popen(char , char *);
8	+FILE popen(const char ,const char *);	8	+//FILE popen(char , char *);
		9	+FILE popen(const char , const char *);
9	int pclose (FILE *);	10	int pclose (FILE *);
10	-char tempnam(char ,char*);	11	-char tempnam(char ,char*);
11	+char tempnam(const char ,const char*);	12	+//char tempnam(char ,char*);
		13	+char tempnam(const char , const char *);
12		14
13		15	//determines size of a static array (won't work with pointers)
14	#define BINDINGS 65	16	#define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))