summaryrefslogtreecommitdiff
path: root/x11/eterm
diff options
context:
space:
mode:
Diffstat (limited to 'x11/eterm')
-rw-r--r--x11/eterm/Makefile19
-rw-r--r--x11/eterm/PLIST231
-rw-r--r--x11/eterm/distinfo21
-rw-r--r--x11/eterm/options.mk9
-rw-r--r--x11/eterm/patches/patch-ac30
5 files changed, 73 insertions, 237 deletions
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 8a8e1501504..d8adc2e2907 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2009/09/20 12:51:42 obache Exp $
+# $NetBSD: Makefile,v 1.59 2009/09/21 07:29:30 obache Exp $
-DISTNAME= Eterm-0.9.4
+DISTNAME= Eterm-0.9.5
PKGNAME= ${DISTNAME:S/^E/e/}
-PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/}
-DISTFILES= ${DEFAULT_DISTFILES} ${PIXMAP_FILES}
+DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/Eterm-/Eterm-bg-/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.eterm.org/
@@ -13,17 +12,13 @@ COMMENT= Enlightened terminal emulator for the X Window System
PKG_DESTDIR_SUPPORT= user-destdir
-SITES.Eterm-bg-scale-1.tar.gz= ${MASTER_SITE_BACKUP}
-SITES.Eterm-bg-scale-2.tar.gz= ${MASTER_SITE_BACKUP}
-SITES.Eterm-bg-tile.tar.gz= ${MASTER_SITE_BACKUP}
-
-PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
- Eterm-bg-tile.tar.gz
-
USE_TOOLS+= perl:run
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
+
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --enable-multi-charset=unicode
+CONFIGURE_ARGS+= --enable-auto-encoding
PKG_SYSCONFSUBDIR= Eterm
OWN_DIRS= ${PKG_SYSCONFDIR}/themes
@@ -44,7 +39,7 @@ SPECIAL_PERMS= ${PREFIX}/bin/Eterm ${SETUID_ROOT_PERMS}
.include "options.mk"
pre-extract:
- ${LN} -sf ${WRKSRC} ${WRKDIR}/Eterm
+ ${LN} -sf ${WRKSRC}/bg ${WRKDIR}/bg
.include "../../devel/libast/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
diff --git a/x11/eterm/PLIST b/x11/eterm/PLIST
index a8628627604..0c258cc5b68 100644
--- a/x11/eterm/PLIST
+++ b/x11/eterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:24:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/09/21 07:29:30 obache Exp $
bin/Esetroot
bin/Etbg
bin/Etbg_update_list
@@ -28,189 +28,62 @@ share/Eterm/pix/menu1.png
share/Eterm/pix/menu2.png
share/Eterm/pix/menu3.png
share/Eterm/pix/pixmaps.list
-share/Eterm/pix/scale/Bladerunner-bg.png
-share/Eterm/pix/scale/Building.jpg
-share/Eterm/pix/scale/Canyon.jpg
-share/Eterm/pix/scale/Cavefire-bg.png
-share/Eterm/pix/scale/Daughter.jpg
-share/Eterm/pix/scale/Dragon.jpg
-share/Eterm/pix/scale/Evocation.jpg
-share/Eterm/pix/scale/Gas_Station.jpg
-share/Eterm/pix/scale/Hall_of_Mirrors.jpg
share/Eterm/pix/scale/Neopolis-horizon.jpg
-share/Eterm/pix/scale/Neopolis-horizon.png
-share/Eterm/pix/scale/Piramid.jpg
-share/Eterm/pix/scale/Snow.jpg
-share/Eterm/pix/scale/Terraforming.jpg
-share/Eterm/pix/scale/The_Castle.jpg
-share/Eterm/pix/scale/The_New_Base.jpg
-share/Eterm/pix/scale/after_the_storm.jpg
-share/Eterm/pix/scale/alien_spheres.jpg
-share/Eterm/pix/scale/ascension.png
-share/Eterm/pix/scale/atlantis.jpg
-share/Eterm/pix/scale/back1.jpg
-share/Eterm/pix/scale/back3.jpg
-share/Eterm/pix/scale/beacon2.jpg
-share/Eterm/pix/scale/before_the_storm.jpg
-share/Eterm/pix/scale/bluerising.jpg
-share/Eterm/pix/scale/castle_verde.jpg
-share/Eterm/pix/scale/chamelea.jpg
-share/Eterm/pix/scale/citidel.jpg
-share/Eterm/pix/scale/city3.jpg
-share/Eterm/pix/scale/class_m.jpg
-share/Eterm/pix/scale/conjunction.jpg
-share/Eterm/pix/scale/coup_de_grace.jpg
-share/Eterm/pix/scale/crater_lake.jpg
-share/Eterm/pix/scale/cronus.jpg
-share/Eterm/pix/scale/distant_kin.jpg
-share/Eterm/pix/scale/dvxvb.jpg
-share/Eterm/pix/scale/elysium.jpg
-share/Eterm/pix/scale/enclosure.jpg
-share/Eterm/pix/scale/fossil.jpg
-share/Eterm/pix/scale/fourthday.jpg
-share/Eterm/pix/scale/gaia.jpg
-share/Eterm/pix/scale/gaia_station.jpg
-share/Eterm/pix/scale/galleon.jpg
-share/Eterm/pix/scale/gazebo.jpg
-share/Eterm/pix/scale/good_morning_sunshine.jpg
-share/Eterm/pix/scale/gorgon.jpg
-share/Eterm/pix/scale/holding.jpg
-share/Eterm/pix/scale/hour.jpg
-share/Eterm/pix/scale/hubbles_doorstep.jpg
-share/Eterm/pix/scale/icemoon.jpg
-share/Eterm/pix/scale/inlet.jpg
-share/Eterm/pix/scale/iron_temple.jpg
-share/Eterm/pix/scale/kingdom.jpg
-share/Eterm/pix/scale/lake_of_fire.jpg
-share/Eterm/pix/scale/legacy.jpg
-share/Eterm/pix/scale/lighthouse.jpg
-share/Eterm/pix/scale/lotus.jpg
-share/Eterm/pix/scale/nebula.jpg
-share/Eterm/pix/scale/neopolis.jpg
-share/Eterm/pix/scale/night_of_the_dragon.jpg
-share/Eterm/pix/scale/night_watchman.jpg
-share/Eterm/pix/scale/nocturne.jpg
-share/Eterm/pix/scale/observation_deck.jpg
-share/Eterm/pix/scale/planeta.png
-share/Eterm/pix/scale/pond.png
-share/Eterm/pix/scale/portal.jpg
-share/Eterm/pix/scale/poseidon.png
-share/Eterm/pix/scale/return_to_giza.jpg
-share/Eterm/pix/scale/ripple.png
-share/Eterm/pix/scale/rising.jpg
-share/Eterm/pix/scale/river_of_lead.jpg
-share/Eterm/pix/scale/roche_limit.jpg
-share/Eterm/pix/scale/sentinel.jpg
-share/Eterm/pix/scale/silence.jpg
-share/Eterm/pix/scale/sleepwalker.jpg
-share/Eterm/pix/scale/still_life_study.jpg
-share/Eterm/pix/scale/sun.png
-share/Eterm/pix/scale/the_forest_queen.jpg
-share/Eterm/pix/scale/the_taken_field.jpg
-share/Eterm/pix/scale/traveller.jpg
-share/Eterm/pix/scale/trinity.jpg
-share/Eterm/pix/scale/tunnel.jpg
-share/Eterm/pix/scale/unfriendly_terrain.jpg
-share/Eterm/pix/scale/urmane1.jpg
-share/Eterm/pix/scale/urmane2.jpg
-share/Eterm/pix/scale/urmane3.jpg
-share/Eterm/pix/scale/urmane4.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/thumb_1.png
share/Eterm/pix/thumb_2.png
-share/Eterm/pix/tile/004.png
-share/Eterm/pix/tile/014.png
-share/Eterm/pix/tile/015.png
-share/Eterm/pix/tile/017.png
-share/Eterm/pix/tile/021.png
-share/Eterm/pix/tile/024.png
-share/Eterm/pix/tile/026.png
-share/Eterm/pix/tile/033.png
-share/Eterm/pix/tile/15.png
-share/Eterm/pix/tile/22.png
-share/Eterm/pix/tile/35.png
-share/Eterm/pix/tile/36.png
-share/Eterm/pix/tile/4.png
-share/Eterm/pix/tile/40.png
-share/Eterm/pix/tile/43.png
-share/Eterm/pix/tile/45.png
-share/Eterm/pix/tile/47.png
-share/Eterm/pix/tile/50.png
-share/Eterm/pix/tile/53.png
-share/Eterm/pix/tile/54.png
-share/Eterm/pix/tile/55.png
-share/Eterm/pix/tile/59.png
-share/Eterm/pix/tile/6.png
-share/Eterm/pix/tile/7.png
-share/Eterm/pix/tile/70s_marble.png
-share/Eterm/pix/tile/7m.png
-share/Eterm/pix/tile/a10.png
-share/Eterm/pix/tile/a2.png
-share/Eterm/pix/tile/a8.png
-share/Eterm/pix/tile/atoms.png
-share/Eterm/pix/tile/atoms2.png
-share/Eterm/pix/tile/backwave.jpg
-share/Eterm/pix/tile/blackstone.png
-share/Eterm/pix/tile/blue_marble.png
-share/Eterm/pix/tile/blue_maze.png
-share/Eterm/pix/tile/blue_rock.png
-share/Eterm/pix/tile/blue_sandpaper.png
-share/Eterm/pix/tile/blue_water.png
-share/Eterm/pix/tile/blue_weave.png
-share/Eterm/pix/tile/blurock.png
-share/Eterm/pix/tile/bow-tiles.png
-share/Eterm/pix/tile/brushed_aluminum.png
-share/Eterm/pix/tile/button1.jpg
-share/Eterm/pix/tile/button5.jpg
-share/Eterm/pix/tile/c0de.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/circuit.png
-share/Eterm/pix/tile/coarse_red.png
-share/Eterm/pix/tile/coral3.png
-share/Eterm/pix/tile/coral4.png
-share/Eterm/pix/tile/corrugated_metal.png
-share/Eterm/pix/tile/cyber_bg.png
-share/Eterm/pix/tile/dark_marble.png
-share/Eterm/pix/tile/dirt.png
-share/Eterm/pix/tile/ether.png
-share/Eterm/pix/tile/ether_blue.png
-share/Eterm/pix/tile/ether_green.png
-share/Eterm/pix/tile/firering.png
-share/Eterm/pix/tile/fond_mau.png
-share/Eterm/pix/tile/giger1.png
-share/Eterm/pix/tile/giger2.png
-share/Eterm/pix/tile/green_stucco.png
-share/Eterm/pix/tile/greenred.png
-share/Eterm/pix/tile/greybg.png
-share/Eterm/pix/tile/lava2.png
-share/Eterm/pix/tile/lightb1.png
-share/Eterm/pix/tile/maple1.png
-share/Eterm/pix/tile/money2.png
-share/Eterm/pix/tile/money3.png
-share/Eterm/pix/tile/moss.png
-share/Eterm/pix/tile/multicolor1_dots.png
-share/Eterm/pix/tile/multicolor3_rock.png
-share/Eterm/pix/tile/nebula.jpg
-share/Eterm/pix/tile/pebble1.png
-share/Eterm/pix/tile/plants.png
-share/Eterm/pix/tile/pool_blue.png
-share/Eterm/pix/tile/purpgls.png
-share/Eterm/pix/tile/purple_marble2.png
-share/Eterm/pix/tile/purple_stuff.png
-share/Eterm/pix/tile/qube25p.png
-share/Eterm/pix/tile/red_rock.png
-share/Eterm/pix/tile/red_stucco.png
-share/Eterm/pix/tile/redgray_marble.png
-share/Eterm/pix/tile/shale.png
-share/Eterm/pix/tile/sky2.png
-share/Eterm/pix/tile/soft.png
-share/Eterm/pix/tile/soft_blue.png
-share/Eterm/pix/tile/space.png
-share/Eterm/pix/tile/starry.png
-share/Eterm/pix/tile/strands1.png
-share/Eterm/pix/tile/waves.png
-share/Eterm/pix/tile/woodish1.png
-share/Eterm/pix/tile/wtrstone.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
share/Eterm/themes/Escreen/menus.cfg
share/Eterm/themes/Escreen/pixmaps.list
share/Eterm/themes/Escreen/theme.cfg
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index a7b4c3dbf7c..4696e25a98c 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,20 +1,13 @@
-$NetBSD: distinfo,v 1.17 2008/05/09 18:43:07 agc Exp $
+$NetBSD: distinfo,v 1.18 2009/09/21 07:29:30 obache Exp $
-SHA1 (Eterm-0.9.4.tar.gz) = d63628098b3aa08c8f2bc1bd756683e5fd227995
-RMD160 (Eterm-0.9.4.tar.gz) = ce5d7ba74b19e3c8992d104d00f10302c3e8150e
-Size (Eterm-0.9.4.tar.gz) = 814823 bytes
-SHA1 (Eterm-bg-scale-1.tar.gz) = 39c6146740edf04ddb0aa40ed4e078e8317b0557
-RMD160 (Eterm-bg-scale-1.tar.gz) = cafda0b5cb42803d4b573bb0595e6ef83b54bfe2
-Size (Eterm-bg-scale-1.tar.gz) = 3420298 bytes
-SHA1 (Eterm-bg-scale-2.tar.gz) = 711365b4478dc7cb3891c77a5d9054778c581184
-RMD160 (Eterm-bg-scale-2.tar.gz) = 25f33f4062fa9cc7fd8dc72c125c6e6dc20a08ed
-Size (Eterm-bg-scale-2.tar.gz) = 3145775 bytes
-SHA1 (Eterm-bg-tile.tar.gz) = 2ccb31a8fd0e80e5dd92aebef6baf5554f66e361
-RMD160 (Eterm-bg-tile.tar.gz) = 43761cc527730a0305fd857fad1316b8fd04eefe
-Size (Eterm-bg-tile.tar.gz) = 1568166 bytes
+SHA1 (Eterm-0.9.5.tar.gz) = f2d75354a48734f63f018f7173cebee81f2358c7
+RMD160 (Eterm-0.9.5.tar.gz) = 19e006f0fe2bdd6a95818f11b96bb978b9cb6762
+Size (Eterm-0.9.5.tar.gz) = 796872 bytes
+SHA1 (Eterm-bg-0.9.5.tar.gz) = 26e81a1e91228c971c70ba06e006ef69490ef208
+RMD160 (Eterm-bg-0.9.5.tar.gz) = acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0
+Size (Eterm-bg-0.9.5.tar.gz) = 1883627 bytes
SHA1 (patch-aa) = 19da5e05392994a60fdf47e9d52c82fc41cefa4c
SHA1 (patch-ab) = d019a18bb32f890d6de7c5bb0cdb43e7715a7d4d
-SHA1 (patch-ac) = eaeed9066b546d563f7b0404afbdb9e9737d8f63
SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8
SHA1 (patch-ah) = 9d2a995fa118e30be20aa3fdc18ffee1eeec1192
SHA1 (patch-ai) = 94d684a490752831de2fb2aba92c0b9f461ddb5a
diff --git a/x11/eterm/options.mk b/x11/eterm/options.mk
index 63b8431f632..a4d15284dca 100644
--- a/x11/eterm/options.mk
+++ b/x11/eterm/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2008/01/27 16:10:25 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2009/09/21 07:29:30 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.eterm
+PKG_SUPPORTED_OPTIONS= xim
+PKG_SUGGESTED_OPTIONS= xim
.include "../../mk/bsd.prefs.mk"
-PKG_SUPPORTED_OPTIONS= # none
.if ${MACHINE_ARCH} == "i386"
PKG_SUPPORTED_OPTIONS+= mmx
.endif
@@ -14,3 +15,7 @@ PKG_SUPPORTED_OPTIONS+= mmx
.if !empty(PKG_OPTIONS:Mmmx)
CONFIGURE_ARGS+= --enable-mmx
.endif
+
+.if !empty(PKG_OPTIONS:Mxim)
+CONFIGURE_ARGS+= --enable-xim
+.endif
diff --git a/x11/eterm/patches/patch-ac b/x11/eterm/patches/patch-ac
deleted file mode 100644
index ba68c5f4ea5..00000000000
--- a/x11/eterm/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2008/04/03 22:42:33 tonnerre Exp $
-
-Fix X11 privilege escalation vulnerability (CVE-2008-1142).
-
---- src/startup.c.orig 2008-03-31 19:27:46.000000000 +0200
-+++ src/startup.c
-@@ -95,11 +95,7 @@ eterm_bootstrap(int argc, char *argv[])
- init_libast();
-
- /* Open display, get options/resources and create the window */
-- if (getenv("DISPLAY") == NULL) {
-- display_name = STRDUP(":0");
-- } else {
-- display_name = STRDUP(getenv("DISPLAY"));
-- }
-+ display_name = NULL;
-
- /* This MUST be called before any other Xlib functions */
- #ifdef SPIFOPT_SETTING_PREPARSE
-@@ -116,7 +112,9 @@ eterm_bootstrap(int argc, char *argv[])
- privileges(REVERT);
- #endif
- if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) {
-- libast_print_error("can't open display %s\n", display_name);
-+ libast_print_error("can't open display %s\n", display_name?display_name:
-+ getenv("DISPLAY")?getenv("DISPLAY"):
-+ "as no -display given and DISPLAY not set");
- exit(EXIT_FAILURE);
- }
- XSetErrorHandler((XErrorHandler) xerror_handler);