Date: Mon, 27 Feb 2017 10:05:16 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434922 - in head/x11-wm/euclid-wm: . files Message-ID: <201702271005.v1RA5Gh3006016@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Feb 27 10:05:15 2017 New Revision: 434922 URL: https://svnweb.freebsd.org/changeset/ports/434922 Log: Unbreak port - Move from Google Code to GitHub - Update maintainer email PR: 213190 Submitted by: Mageirias Anastasios <anastasios@mageirias.com> (maintainer) Approved by: lme (mentor) Differential Revision: https://reviews.freebsd.org/D9822 Added: head/x11-wm/euclid-wm/files/patch-euclid-menu.c (contents, props changed) Modified: head/x11-wm/euclid-wm/Makefile head/x11-wm/euclid-wm/distinfo head/x11-wm/euclid-wm/files/patch-Makefile head/x11-wm/euclid-wm/files/patch-euclid-wm.c head/x11-wm/euclid-wm/pkg-descr Modified: head/x11-wm/euclid-wm/Makefile ============================================================================== --- head/x11-wm/euclid-wm/Makefile Mon Feb 27 09:56:17 2017 (r434921) +++ head/x11-wm/euclid-wm/Makefile Mon Feb 27 10:05:15 2017 (r434922) @@ -2,36 +2,49 @@ 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= anastmag@gmail.com +MAINTAINER= anastasios@mageirias.com COMMENT= Minimalist, tiling window manager for X11 LICENSE= BSD3CLAUSE -BROKEN= Unfetchable (google code has gone away) - -OPTIONS_DEFINE= XINERAMA -XINERAMA_DESC= X11 Xinerama extention support -OPTIONS_DEFAULT=XINERAMA +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 -XINERAMA_USE= XORG=xinerama +EUCLID_MENU_ALL_TARGET= euclid-menu +XINERAMA_USE= XORG=xinerama -USES= gmake +USES= gmake USE_XORG= x11 PLIST_FILES= bin/euclid-wm \ bin/start-euclid \ man/man1/euclid-wm.1.gz \ - share/euclid-wm/euclid-wm.conf \ - share/euclid-wm/euclidrc \ - share/euclid-wm/VERSION \ - share/xsessions/euclid.desktop + 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> Modified: head/x11-wm/euclid-wm/distinfo ============================================================================== --- head/x11-wm/euclid-wm/distinfo Mon Feb 27 09:56:17 2017 (r434921) +++ head/x11-wm/euclid-wm/distinfo Mon Feb 27 10:05:15 2017 (r434922) @@ -1,2 +1,3 @@ -SHA256 (euclid-wm-0.4.3.tar.gz) = 7498215584aabe3e035adc42fb3daa5b85d53e5a61836523eb670a1a724158db -SIZE (euclid-wm-0.4.3.tar.gz) = 23871 +TIMESTAMP = 1475169953 +SHA256 (wmdiem-euclid-wm-0.4.3-b6b0319_GH0.tar.gz) = 1941c0a2522bf5bd22daf920babf45bd8ad039b63751c7e1a0203cc05f72e93e +SIZE (wmdiem-euclid-wm-0.4.3-b6b0319_GH0.tar.gz) = 35476 Modified: head/x11-wm/euclid-wm/files/patch-Makefile ============================================================================== --- head/x11-wm/euclid-wm/files/patch-Makefile Mon Feb 27 09:56:17 2017 (r434921) +++ head/x11-wm/euclid-wm/files/patch-Makefile Mon Feb 27 10:05:15 2017 (r434922) @@ -1,4 +1,4 @@ ---- Makefile.orig 2013-12-16 15:18:31 UTC +--- Makefile.orig 2015-09-06 19:45:03 UTC +++ Makefile @@ -1,6 +1,6 @@ -PREFIX = usr @@ -7,24 +7,18 @@ -MANDIR = ${SHAREDIR}/man +MANDIR = ${PREFIX}/man BINDIR = ${PREFIX}/bin - SVNREV = 222 - VER = 0.4.2 -@@ -13,12 +13,12 @@ endif + SVNREV = 224 + VER = 0.4.3 +@@ -13,7 +13,7 @@ endif CONFDIR = ${XDG_CONFIG_HOME}/euclid-wm CC = cc -pedantic -Wall --CFLAGS = -O2 -g -std=c99 -+CFLAGS = -O2 -g -std=c99 -I/usr/local/include -L/usr/local/lib +-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 - --all: euclid-wm -+all: noxinerama - - euclid-wm: euclid-wm.c - ${CC} $< ${LDFLAGS} ${CFLAGS} -o $@ -@@ -28,14 +28,23 @@ noxinerama: euclid-wm.c +@@ -31,19 +31,34 @@ noxinerama: euclid-wm.c cp noxinerama euclid-wm install: all @@ -34,11 +28,18 @@ - @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 ++ @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 @@ -47,11 +48,21 @@ +# @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 -+ @cp -f VERSION ${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 ++ @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 Added: head/x11-wm/euclid-wm/files/patch-euclid-menu.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/euclid-wm/files/patch-euclid-menu.c Mon Feb 27 10:05:15 2017 (r434922) @@ -0,0 +1,11 @@ +--- euclid-menu.c.orig 2016-12-17 00:40:07 UTC ++++ euclid-menu.c +@@ -211,7 +211,7 @@ void load_handlers() { + chdir(getenv("HOME")); //so when we run a program it isn't in a config dir. + } + +-inline char* find_handler() { ++static inline char* find_handler() { + //read buf use an aray to pick the appropriate file handler and return the command + //what is here now is a bit simple, we need to also check the end of the line to see whether the returned command is prompting for another handler (e.g., if the command takes a filename or a URL as an argument + if (buf[0] == ':') { Modified: head/x11-wm/euclid-wm/files/patch-euclid-wm.c ============================================================================== --- head/x11-wm/euclid-wm/files/patch-euclid-wm.c Mon Feb 27 09:56:17 2017 (r434921) +++ head/x11-wm/euclid-wm/files/patch-euclid-wm.c Mon Feb 27 10:05:15 2017 (r434922) @@ -1,14 +1,16 @@ ---- euclid-wm.c.orig 2013-12-16 15:18:31 UTC +--- euclid-wm.c.orig 2015-09-06 19:45:03 UTC +++ euclid-wm.c -@@ -93,9 +93,9 @@ Thus the one or more of the following no +@@ -93,9 +93,11 @@ Thus the one or more of the following no //this is a hack -FILE *popen(char *, char *); -+FILE *popen(const char *,const char *); ++//FILE *popen(char *, char *); ++FILE *popen(const char *, const char *); int pclose (FILE *); -char *tempnam(char *,char*); -+char *tempnam(const char *,const char*); ++//char *tempnam(char *,char*); ++char *tempnam(const char *, const char *); - - #define BINDINGS 65 + //determines size of a static array (won't work with pointers) + #define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0])) Modified: head/x11-wm/euclid-wm/pkg-descr ============================================================================== --- head/x11-wm/euclid-wm/pkg-descr Mon Feb 27 09:56:17 2017 (r434921) +++ head/x11-wm/euclid-wm/pkg-descr Mon Feb 27 10:05:15 2017 (r434922) @@ -6,4 +6,5 @@ euclid seeks to do two things in particu or fixed layouts with the flexibility of those dynamic layouts, - create an easy way to manage minimized windows +WWW: https://github.com/wmdiem/euclid-wm WWW: http://euclid-wm.sourceforge.net
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702271005.v1RA5Gh3006016>