3 files changed, 68 insertions, 85 deletions

diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index dd28efab1b79..64035aee2cd2 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	eterm-bg
-PORTVERSION=	0.9
-CATEGORIES=	graphics x11
-MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/Eterm/ \
-		ftp://ftp.dti.ad.jp/pub/X/enlightenment/Eterm/ \
-		ftp://ftp.kddlabs.co.jp/.10/X11/window_manager/enlightenment/Eterm/ \
-		ftp://ftp.sogang.ac.kr/.c/tools/X11/Enlightenment/Eterm/
+PORTVERSION=	0.9.3
+CATEGORIES=	graphics
+MASTER_SITES=	http://www.eterm.org/download/
 DISTNAME=	Eterm-bg-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,23 +17,13 @@ COMMENT=	Image files for background of Eterm
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
-RM_FILES1=	014.jpg 40.jpg backwave.jpg blackstone.jpg circuit.jpg nebula.jpg
-RM_FILES2=	fourthday.jpg gaia.jpg galleon.jpg nebula.jpg night_of_the_dragon.jpg
-
-post-extract:
-	cd ${WRKSRC}/bg/tile; ${RM} ${RM_FILES1}
-	cd ${WRKSRC}/bg/scale; ${RM} ${RM_FILES2}
 
 do-install:
+	${MKDIR} ${PREFIX}/share/Eterm
 	${MKDIR} ${PREFIX}/share/Eterm/pix
-	cd ${WRKSRC}; ${INSTALL_DATA} bg/scale/*  ${PREFIX}/share/Eterm/pix
-	cd ${WRKSRC}; ${INSTALL_DATA} bg/tile/*  ${PREFIX}/share/Eterm/pix
-
-dd-i:
-	for dist in ${DISTFILES}; do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-			${DISTDIR}/$${dist} \
-			${EXTRACT_AFTER_ARGS} -C ${PREFIX}/share/Eterm; \
-	done;
+	${MKDIR} ${PREFIX}/share/Eterm/pix/scale
+	${MKDIR} ${PREFIX}/share/Eterm/pix/tile
+	${INSTALL_DATA} ${WRKSRC}/bg/scale/*  ${PREFIX}/share/Eterm/pix/scale
+	${INSTALL_DATA} ${WRKSRC}/bg/tile/*  ${PREFIX}/share/Eterm/pix/tile
 
 .include <bsd.port.mk>
diff --git a/graphics/eterm-bg/distinfo b/graphics/eterm-bg/distinfo
index 129cf0aa8ec9..a9f4e5bd4cd8 100644
--- a/graphics/eterm-bg/distinfo
+++ b/graphics/eterm-bg/distinfo
@@ -1,2 +1,2 @@
-MD5 (Eterm-bg-0.9.tar.gz) = 2093e5b53aa8e8e2acd0ce0e71fbaee2
-SIZE (Eterm-bg-0.9.tar.gz) = 1083412
+MD5 (Eterm-bg-0.9.3.tar.gz) = e8c6567b13d7fb760bded56c1d1a181d
+SIZE (Eterm-bg-0.9.3.tar.gz) = 1883627
diff --git a/graphics/eterm-bg/pkg-plist b/graphics/eterm-bg/pkg-plist
index 00b2f3490a40..3b8066c22fe0 100644
--- a/graphics/eterm-bg/pkg-plist
+++ b/graphics/eterm-bg/pkg-plist
@@ -1,62 +1,58 @@
-share/Eterm/pix/004.jpg
-share/Eterm/pix/015.jpg
-share/Eterm/pix/021.jpg
-share/Eterm/pix/024.jpg
-share/Eterm/pix/026.png
-share/Eterm/pix/15.jpg
-share/Eterm/pix/22.jpg
-share/Eterm/pix/35.jpg
-share/Eterm/pix/59.jpg
-share/Eterm/pix/7.jpg
-share/Eterm/pix/70s_marble.jpg
-share/Eterm/pix/7m.jpg
-share/Eterm/pix/Bladerunner-bg.jpg
-share/Eterm/pix/Canyon.jpg
-share/Eterm/pix/Cavefire-bg.jpg
-share/Eterm/pix/Daughter.jpg
-share/Eterm/pix/Dragon.jpg
-share/Eterm/pix/Evocation.jpg
-share/Eterm/pix/Neopolis-horizon.jpg
-share/Eterm/pix/after_the_storm.jpg
-share/Eterm/pix/alien_spheres.jpg
-share/Eterm/pix/ascension.jpg
-share/Eterm/pix/atlantis.jpg
-share/Eterm/pix/atoms.jpg
-share/Eterm/pix/blue_marble.jpg
-share/Eterm/pix/blue_maze.jpg
-share/Eterm/pix/blue_rock.jpg
-share/Eterm/pix/citidel.jpg
-share/Eterm/pix/crater_lake.jpg
-share/Eterm/pix/cronus.jpg
-share/Eterm/pix/cyber_bg.jpg
-share/Eterm/pix/dark_marble.jpg
-share/Eterm/pix/dirt.jpg
-share/Eterm/pix/dvxvb.jpg
-share/Eterm/pix/ether.jpg
-share/Eterm/pix/ether_blue.jpg
-share/Eterm/pix/ether_green.jpg
-share/Eterm/pix/giger1.jpg
-share/Eterm/pix/giger2.jpg
-share/Eterm/pix/gorgon.jpg
-share/Eterm/pix/icemoon.jpg
-share/Eterm/pix/lake_of_fire.jpg
-share/Eterm/pix/lightb1.jpg
-share/Eterm/pix/lighthouse.jpg
-share/Eterm/pix/planeta.jpg
-share/Eterm/pix/pond.jpg
-share/Eterm/pix/poseidon.jpg
-share/Eterm/pix/purpgls.jpg
-share/Eterm/pix/purple_stuff.jpg
-share/Eterm/pix/red_stucco.jpg
-share/Eterm/pix/ripple.jpg
-share/Eterm/pix/roche_limit.jpg
-share/Eterm/pix/shale.jpg
-share/Eterm/pix/silence.jpg
-share/Eterm/pix/soft.jpg
-share/Eterm/pix/space.png
-share/Eterm/pix/starry.jpg
-share/Eterm/pix/the_taken_field.jpg
-share/Eterm/pix/urmane3.jpg
-share/Eterm/pix/wasteland.jpg
-@dirrm share/Eterm/pix
-@dirrm share/Eterm
+share/Eterm/pix/scale/Neopolis-horizon.jpg
+share/Eterm/pix/scale/day-night.jpg
+share/Eterm/pix/scale/midnight_sky.png
+share/Eterm/pix/scale/sailors_delight.png
+share/Eterm/pix/scale/wasteland.jpg
+share/Eterm/pix/scale/wintertree.jpg
+share/Eterm/pix/tile/a_distant_star.png
+share/Eterm/pix/tile/acid_chess.png
+share/Eterm/pix/tile/alpha_centauri.png
+share/Eterm/pix/tile/army_brat.png
+share/Eterm/pix/tile/bubbly1.jpg
+share/Eterm/pix/tile/bubbly2.jpg
+share/Eterm/pix/tile/bubbly3.jpg
+share/Eterm/pix/tile/bubbly4.jpg
+share/Eterm/pix/tile/circuit.jpg
+share/Eterm/pix/tile/cold_steel.png
+share/Eterm/pix/tile/conch.png
+share/Eterm/pix/tile/confusion.jpg
+share/Eterm/pix/tile/connect_the_dots.png
+share/Eterm/pix/tile/cyber_bg.jpg
+share/Eterm/pix/tile/darkness.png
+share/Eterm/pix/tile/falling.png
+share/Eterm/pix/tile/fascination.png
+share/Eterm/pix/tile/firestorm.png
+share/Eterm/pix/tile/for_a_moment.png
+share/Eterm/pix/tile/graffiti.png
+share/Eterm/pix/tile/gray_matter.png
+share/Eterm/pix/tile/lightning_crashes.png
+share/Eterm/pix/tile/marbles.png
+share/Eterm/pix/tile/moody_blues.png
+share/Eterm/pix/tile/murky_depths.png
+share/Eterm/pix/tile/oil_on_canvas.png
+share/Eterm/pix/tile/pebble_beach.png
+share/Eterm/pix/tile/ping-pong.png
+share/Eterm/pix/tile/plasma.png
+share/Eterm/pix/tile/pulse.png
+share/Eterm/pix/tile/rolling_meadows.png
+share/Eterm/pix/tile/shades_of_being.png
+share/Eterm/pix/tile/shale.jpg
+share/Eterm/pix/tile/shattered_windows.png
+share/Eterm/pix/tile/shock_and_awe.png
+share/Eterm/pix/tile/sitting_in_acid.png
+share/Eterm/pix/tile/spring_rain.png
+share/Eterm/pix/tile/stained_glass.png
+share/Eterm/pix/tile/tales_of_earthsea.png
+share/Eterm/pix/tile/tangled_web.png
+share/Eterm/pix/tile/the_wall.png
+share/Eterm/pix/tile/trees_are_leafy.png
+share/Eterm/pix/tile/veins.png
+share/Eterm/pix/tile/veins_2.png
+share/Eterm/pix/tile/violetta.png
+share/Eterm/pix/tile/water_into_wine.png
+share/Eterm/pix/tile/wormhole.png
+share/Eterm/pix/tile/woven_memories.png
+@unexec rmdir %D/share/Eterm/pix/scale 2>/dev/null || true
+@unexec rmdir %D/share/Eterm/pix/tile 2>/dev/null || true
+@unexec rmdir %D/share/Eterm/pix 2>/dev/null || true
+@unexec rmdir %D/share/Eterm 2>/dev/null || true