summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2005-06-16 04:25:36 +0000
committerMichael Johnson <ahze@FreeBSD.org>2005-06-16 04:25:36 +0000
commit8452d054bf6202799e3aaa923b4a58bd6f97cba3 (patch)
tree0e2cd5f2c5fbfcdf1ad1cee1ede3d7bf5948a057 /x11
parent- Update to 2.26 (diff)
- Update to 2.6.2
PR: ports/82257 Submitted by: David Yeske <dyeske@yahoo.com> (maintainer)
Notes
Notes: svn path=/head/; revision=137518
Diffstat (limited to 'x11')
-rw-r--r--x11/electricsheep/Makefile19
-rw-r--r--x11/electricsheep/distinfo4
-rw-r--r--x11/electricsheep/files/patch-electricsheep.c19
-rw-r--r--x11/electricsheep/pkg-plist3
4 files changed, 26 insertions, 19 deletions
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 511e89d3dade..53d2eb8592ba 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= electricsheep
-PORTVERSION= 2.6d
+PORTVERSION= 2.6.2
+PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://electricsheep.org/
-DISTNAME= ${PORTNAME}-2.6.1
+DISTNAME= ${PORTNAME}-2.6.2
MAINTAINER= dyeske@yahoo.com
COMMENT= A nice distributed screensaver
@@ -25,9 +26,7 @@ RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \
RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
.endif
-BROKEN= "Does not compile"
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-2.6.1
+WRKSRC= ${WRKDIR}/${PORTNAME}-2.6.2
USE_X_PREFIX= yes
USE_SDL= sdl
@@ -45,12 +44,6 @@ LIBTOOLFILES= configure mpeg2dec/configure flam3/configure
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= "Does not compile on FreeBSD 4.x"
-.else
-BROKEN= "Incomplete pkg-plist"
-.endif
-
pre-everything::
.if !defined(WITH_XSCREENSAVER)
@${ECHO_MSG} "elecricsheep has the following tunable option(s):"
@@ -85,7 +78,6 @@ post-patch:
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/electricsheep-voter ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/uniqueid ${PREFIX}/bin/esheep-uniqueid
@${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-animate ${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-convert ${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-genome ${PREFIX}/bin
@@ -101,8 +93,5 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/electricsheep.man ${PREFIX}/man/man1/electricsheep.1
.endif
-post-install:
- @${PREFIX}/bin/esheep-uniqueid > ${DATADIR}/electricsheep-uniqueid
-
.include <bsd.port.post.mk>
diff --git a/x11/electricsheep/distinfo b/x11/electricsheep/distinfo
index 19aaa108390e..ef7a7b287b6b 100644
--- a/x11/electricsheep/distinfo
+++ b/x11/electricsheep/distinfo
@@ -1,2 +1,2 @@
-MD5 (electricsheep-2.6.1.tar.gz) = bdf7e1aac35657e8ea5f03bbbba9dba9
-SIZE (electricsheep-2.6.1.tar.gz) = 1498251
+MD5 (electricsheep-2.6.2.tar.gz) = 8a9f914e1dbf03d750d5b279f01e6c46
+SIZE (electricsheep-2.6.2.tar.gz) = 1498167
diff --git a/x11/electricsheep/files/patch-electricsheep.c b/x11/electricsheep/files/patch-electricsheep.c
new file mode 100644
index 000000000000..d4d1bdbc16ed
--- /dev/null
+++ b/x11/electricsheep/files/patch-electricsheep.c
@@ -0,0 +1,19 @@
+--- electricsheep.c.orig Thu Jun 16 00:19:15 2005
++++ electricsheep.c Thu Jun 16 00:19:59 2005
+@@ -1201,6 +1201,7 @@
+ time_t server_anims_timestamp = -1;
+
+ void update_server_anims() {
++ XML_Parser parser;
+ char pbuf[MAXBUF];
+ FILE *lf;
+ int done;
+@@ -1216,7 +1217,7 @@
+ server_anims_timestamp = now;
+ }
+
+- XML_Parser parser = XML_ParserCreate(NULL);
++ parser = XML_ParserCreate(NULL);
+ XML_SetElementHandler(parser, list_start_element, get_end_element);
+ XML_SetCharacterDataHandler(parser, character_handler);
+ in_message = 0;
diff --git a/x11/electricsheep/pkg-plist b/x11/electricsheep/pkg-plist
index 713926dfac76..f4884d66551a 100644
--- a/x11/electricsheep/pkg-plist
+++ b/x11/electricsheep/pkg-plist
@@ -5,9 +5,8 @@ bin/flam3-animate
bin/flam3-convert
bin/flam3-genome
bin/flam3-render
-bin/esheep-uniqueid
%%DATADIR%%/electricsheep-frown.png
%%DATADIR%%/electricsheep-smile.png
%%DATADIR%%/electricsheep-splash-0.tif
%%DATADIR%%/electricsheep-splash-1.tif
-@unexec rmdir %%DATADIR%% 2>/dev/null || true
+@dirrm %%DATADIR%%