[97476] trunk/dports/x11/xteddy
ryandesign at macports.org
ryandesign at macports.org
Fri Sep 7 01:14:45 PDT 2012
Revision: 97476
https://trac.macports.org/changeset/97476
Author: ryandesign at macports.org
Date: 2012-09-07 01:14:44 -0700 (Fri, 07 Sep 2012)
Log Message:
-----------
xteddy: update to 2.2; license GPL-2
Modified Paths:
--------------
trunk/dports/x11/xteddy/Portfile
Added Paths:
-----------
trunk/dports/x11/xteddy/files/patch-Makefile.in.diff
trunk/dports/x11/xteddy/files/patch-xteddy.6.diff
trunk/dports/x11/xteddy/files/patch-xteddy.c.diff
trunk/dports/x11/xteddy/files/patch-xteddy_test.diff
trunk/dports/x11/xteddy/files/patch-xtoys.diff
Removed Paths:
-------------
trunk/dports/x11/xteddy/files/patch-xtoys
Modified: trunk/dports/x11/xteddy/Portfile
===================================================================
--- trunk/dports/x11/xteddy/Portfile 2012-09-07 07:54:45 UTC (rev 97475)
+++ trunk/dports/x11/xteddy/Portfile 2012-09-07 08:14:44 UTC (rev 97476)
@@ -4,11 +4,11 @@
PortSystem 1.0
name xteddy
-version 2.0.2
-revision 1
+version 2.2
categories x11
platforms darwin
maintainers nomaintainer
+license GPL-2
description A cuddlesome teddy for the X desktop
@@ -16,24 +16,28 @@
lovers: a very, very cuddlesome teddy.
homepage http://www.itn.liu.se/~stegu/xteddy/
-master_sites http://www.itn.liu.se/~stegu/xteddy/ freebsd
+master_sites ${homepage} freebsd
-checksums md5 c197253b5116db5dc4e32b58dd36160e
+checksums rmd160 8395ce8c9a1af208ec44bd9a773fda3b5d1c6df2 \
+ sha256 d8885a1e2e08787cb469857a9404619cadab9bddcae7fa398a565d53633291e2
-depends_lib port:xorg-libsm \
- port:imlib \
+depends_lib port:imlib2 \
+ port:xorg-libXext \
port:zlib
-# port:imlib is not universal
-universal_variant no
+patchfiles patch-Makefile.in.diff \
+ patch-xteddy.6.diff \
+ patch-xteddy.c.diff \
+ patch-xteddy_test.diff \
+ patch-xtoys.diff
-patchfiles patch-xtoys
-
post-patch {
- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/xtoys
+ reinplace "s|__PREFIX__|${prefix}|g" \
+ ${worksrcpath}/xteddy.6 \
+ ${worksrcpath}/xteddy.c \
+ ${worksrcpath}/xteddy_test \
+ ${worksrcpath}/xtoys
}
-configure.args --mandir=${prefix}/share/man
-
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)
Added: trunk/dports/x11/xteddy/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/x11/xteddy/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/x11/xteddy/files/patch-Makefile.in.diff 2012-09-07 08:14:44 UTC (rev 97476)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-03-09 02:26:24.000000000 -0500
++++ Makefile.in 2012-09-07 03:11:36.000000000 -0500
+@@ -184,7 +184,7 @@
+ man_MANS = xteddy.6
+ bin_SCRIPTS = xtoys xteddy_test
+ AM_CFLAGS = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++AM_LDFLAGS = @IMLIB2_LIBS@ -lX11 -lXext
+ SUBDIRS = html images
+ EXTRA_DIST = $(man_MANS) $(bin_SCRIPTS) \
+ README xteddy.README images.credit \
Added: trunk/dports/x11/xteddy/files/patch-xteddy.6.diff
===================================================================
--- trunk/dports/x11/xteddy/files/patch-xteddy.6.diff (rev 0)
+++ trunk/dports/x11/xteddy/files/patch-xteddy.6.diff 2012-09-07 08:14:44 UTC (rev 97476)
@@ -0,0 +1,13 @@
+--- xteddy.6.orig 2009-03-02 16:50:03.000000000 -0600
++++ xteddy.6 2012-09-07 02:41:16.000000000 -0500
+@@ -78,9 +78,7 @@
+ a transparent background. If there is no such file in the current
+ working directory
+ .I xteddy
+-searches in $(installation_prefix)/share/xteddy, where
+-$(installation_prefix) is determined at compile time (for instance
+-/usr/X11R6). If this fails by default /usr/share/xteddy is searched.
++searches in __PREFIX__/share/xteddy.
+ Failing this, /usr/local/share/xteddy is searched.
+ If there is no such file in these directories the following appendixes
+ where appended to the given name: xpm, png, tif, jpg, jpeg, gif and
Added: trunk/dports/x11/xteddy/files/patch-xteddy.c.diff
===================================================================
--- trunk/dports/x11/xteddy/files/patch-xteddy.c.diff (rev 0)
+++ trunk/dports/x11/xteddy/files/patch-xteddy.c.diff 2012-09-07 08:14:44 UTC (rev 97476)
@@ -0,0 +1,14 @@
+--- xteddy.c.orig 2009-03-09 02:24:23.000000000 -0500
++++ xteddy.c 2012-09-07 02:43:14.000000000 -0500
+@@ -16,9 +16,9 @@
+ /* from Peter De Wachter <pdewacht at gmail.com> */
+ /* Changes: see ChangeLog */
+
+-#define DEFAULT_IMAGE_DIR "/usr/share/xteddy"
++#define DEFAULT_IMAGE_DIR "__PREFIX__/share/xteddy"
+ #define DEFAULT_LOCAL_IMAGE_DIR "/usr/local/share/xteddy"
+-#define XTEDDY_VERSION "2.02"
++#define XTEDDY_VERSION "2.2"
+
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
Added: trunk/dports/x11/xteddy/files/patch-xteddy_test.diff
===================================================================
--- trunk/dports/x11/xteddy/files/patch-xteddy_test.diff (rev 0)
+++ trunk/dports/x11/xteddy/files/patch-xteddy_test.diff 2012-09-07 08:14:44 UTC (rev 97476)
@@ -0,0 +1,15 @@
+--- xteddy_test.orig 2009-02-07 14:48:26.000000000 -0600
++++ xteddy_test 2012-09-07 02:06:02.000000000 -0500
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ i=0
+-if [ -d /usr/share/xteddy ] ; then
+- for img in `ls /usr/share/xteddy` ; do
++if [ -d __PREFIX__/share/xteddy ] ; then
++ for img in `ls __PREFIX__/share/xteddy` ; do
+ i=`expr $i + 50`
+- xteddy -F/usr/share/xteddy/$img -geometry +$i+$i &
++ xteddy -F__PREFIX__/share/xteddy/$img -geometry +$i+$i &
+ done
+ fi
+ if [ -d /usr/local/share/xteddy ] ; then
Deleted: trunk/dports/x11/xteddy/files/patch-xtoys
===================================================================
--- trunk/dports/x11/xteddy/files/patch-xtoys 2012-09-07 07:54:45 UTC (rev 97475)
+++ trunk/dports/x11/xteddy/files/patch-xtoys 2012-09-07 08:14:44 UTC (rev 97476)
@@ -1,19 +0,0 @@
---- xtoys 2003-06-30 08:36:35.000000000 +0200
-+++ xtoys 2006-01-09 09:46:19.000000000 +0100
-@@ -5,8 +5,8 @@
- # Thanks to Andrew Stribblehill <a.d.stribblehill at dur.ac.uk>
- # who supported this script
- #
--if [ -d /usr/local/share/xteddy ] ; then
-- images=(`ls /usr/share/xteddy` `ls /usr/local/share/xteddy 2> /dev/null`)
-+if [ -d __PREFIX__/share/xteddy ] ; then
-+ images=(`ls __PREFIX__/share/xteddy`)
- else
- images=(`ls /usr/share/xteddy`)
- fi
-@@ -14,4 +14,4 @@
- num=${#images[*]}
- choice=`expr $RANDOM % $num`
-
--/usr/games/xteddy -F${images[choice]} $*
-+__PREFIX__/bin/xteddy -F__PREFIX__/share/xteddy/${images[choice]} $*
Copied: trunk/dports/x11/xteddy/files/patch-xtoys.diff (from rev 97439, trunk/dports/x11/xteddy/files/patch-xtoys)
===================================================================
--- trunk/dports/x11/xteddy/files/patch-xtoys.diff (rev 0)
+++ trunk/dports/x11/xteddy/files/patch-xtoys.diff 2012-09-07 08:14:44 UTC (rev 97476)
@@ -0,0 +1,24 @@
+--- xtoys.orig 2009-02-07 14:48:26.000000000 -0600
++++ xtoys 2012-09-07 02:02:18.000000000 -0500
+@@ -1,17 +1,17 @@
+ #!/bin/bash
+ #
+-# /usr/bin/X11/xtoys -- puts a random cuddly toy onto desktop
++# __PREFIX__/bin/X11/xtoys -- puts a random cuddly toy onto desktop
+ #
+ # Thanks to Andrew Stribblehill <a.d.stribblehill at dur.ac.uk>
+ # who supported this script
+ #
+ if [ -d /usr/local/share/xteddy ] ; then
+- images=(`ls /usr/share/xteddy` `ls /usr/local/share/xteddy 2> /dev/null`)
++ images=(`ls __PREFIX__/share/xteddy` `ls /usr/local/share/xteddy 2> /dev/null`)
+ else
+- images=(`ls /usr/share/xteddy`)
++ images=(`ls __PREFIX__/share/xteddy`)
+ fi
+
+ num=${#images[*]}
+ choice=`expr $RANDOM % $num`
+
+-/usr/games/xteddy -F${images[choice]} $*
++__PREFIX__/bin/xteddy -F${images[choice]} $*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120907/5516c4f0/attachment-0001.html>
More information about the macports-changes
mailing list