Date: Thu, 28 Jun 2007 02:00:28 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/114080: Update port: x11-wm/epiwm Message-ID: <20070628020028.93808ce6.tkato432@yahoo.com> Resent-Message-ID: <200706271710.l5RHAAtb074642@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114080 >Category: ports >Synopsis: Update port: x11-wm/epiwm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 27 17:10:09 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.2-RELEASE-p5 i386 >Organization: >Environment: >Description: - Fix build with gcc4 - Remove GPLv2 file from PORTDOCS New file: files/patch-modules__logoepiwm__logoEPIwm.c files/patch-src__key.c files/patch-src__style_init.c >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/epiwm/Makefile x11-wm/epiwm/Makefile --- /usr/ports/x11-wm/epiwm/Makefile Sun May 27 12:28:41 2007 +++ x11-wm/epiwm/Makefile Sun Jun 24 01:13:28 2007 @@ -7,41 +7,26 @@ PORTNAME= epiwm PORTVERSION= 0.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.nongnu.org/epiwm/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Another fast, small, configurable window manager -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ - ungif.5:${PORTSDIR}/graphics/libungif - -CONFIG= icons key menu start style window workspace -DOCS= AUTHORS BUGS COPYING ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS \ - README TODO +USE_GNOME= imlib GNU_CONFIGURE= yes -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif post-patch: - ${REINPLACE_CMD} 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \ + ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for ii in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for ii in AUTHORS BUGS ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c --- /usr/ports/x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c Thu Jan 1 09:00:00 1970 +++ x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c Sun Jun 24 01:06:58 2007 @@ -0,0 +1,10 @@ +--- modules/logoepiwm/logoEPIwm.c.orig Sat Feb 3 08:53:20 2001 ++++ modules/logoepiwm/logoEPIwm.c Sun Jun 24 01:06:40 2007 +@@ -1,6 +1,7 @@ + /* This is logoEPIwm */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> diff -urN /usr/ports/x11-wm/epiwm/files/patch-src__key.c x11-wm/epiwm/files/patch-src__key.c --- /usr/ports/x11-wm/epiwm/files/patch-src__key.c Thu Jan 1 09:00:00 1970 +++ x11-wm/epiwm/files/patch-src__key.c Sun Jun 24 01:05:12 2007 @@ -0,0 +1,13 @@ +--- src/key.c.orig Sat Feb 3 08:53:20 2001 ++++ src/key.c Sun Jun 24 01:04:43 2007 +@@ -50,8 +50,8 @@ + tokens[i] = NULL; + i = 0; + strncpy(tmpstring, line, 100); +- (char *) tokens[i] = (char *) strtok(tmpstring, "+"); +- while (((char *) tokens[++i] = (char *) strtok(NULL, "+"))); ++ tokens[i] = (char *) strtok(tmpstring, "+"); ++ while ((tokens[++i] = (char *) strtok(NULL, "+"))); + tokens[i] = NULL; + return (tokens[index]); + } diff -urN /usr/ports/x11-wm/epiwm/files/patch-src__style_init.c x11-wm/epiwm/files/patch-src__style_init.c --- /usr/ports/x11-wm/epiwm/files/patch-src__style_init.c Thu Jan 1 09:00:00 1970 +++ x11-wm/epiwm/files/patch-src__style_init.c Sun Jun 24 01:06:02 2007 @@ -0,0 +1,13 @@ +--- src/style_init.c.orig Sat Feb 3 08:53:20 2001 ++++ src/style_init.c Sun Jun 24 01:05:45 2007 +@@ -77,8 +77,8 @@ + tokens[i] = NULL; + i = 0; + strncpy(tmpstring, line, 100); +- (char *) tokens[i] = (char *) strtok(tmpstring, "\""); +- while (((char *) tokens[++i] = (char *) strtok(NULL, "\""))); ++ tokens[i] = (char *) strtok(tmpstring, "\""); ++ while ((tokens[++i] = (char *) strtok(NULL, "\""))); + tokens[i] = NULL; + return (tokens[index]); + } diff -urN /usr/ports/x11-wm/epiwm/pkg-plist x11-wm/epiwm/pkg-plist --- /usr/ports/x11-wm/epiwm/pkg-plist Sun May 20 05:32:36 2007 +++ x11-wm/epiwm/pkg-plist Sun Jun 24 01:13:04 2007 @@ -10,7 +10,6 @@ etc/epiwm/workspace %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/EPIwm-0.5.6.lsm %%PORTDOCS%%%%DOCSDIR%%/INSTALL >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070628020028.93808ce6.tkato432>