aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/pekwm/Makefile22
-rw-r--r--x11-wm/pekwm/distinfo6
-rw-r--r--x11-wm/pekwm/files/patch-aa11
-rw-r--r--x11-wm/pekwm/files/patch-ab11
-rw-r--r--x11-wm/pekwm/files/patch-data-scripts-pekwm_themeset.sh12
-rw-r--r--x11-wm/pekwm/pkg-descr2
-rw-r--r--x11-wm/pekwm/pkg-plist21
7 files changed, 38 insertions, 47 deletions
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 07ae8f6e91d6..c2735981d97c 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -6,32 +6,34 @@
#
PORTNAME= pekwm
-PORTVERSION= 0.1.6
+PORTVERSION= 0.1.7
PORTEPOCH= 1
CATEGORIES= x11-wm
-MASTER_SITES= http://www.carpetsmoker.net/distfiles/ \
+MASTER_SITES= http://pekwm.org/projects/3/files/ \
+ http://www.carpetsmoker.net/distfiles/ \
http://www.xs4all.nl/~tournoij/distfiles/ \
http://www.rwxrwxrwx.net/distfiles/
-MAINTAINER= carpetsmoker@xs4all.nl
-COMMENT= A windowmanager based on aewm++
+MAINTAINER= carpetsmoker@rwxrwxrwx.net
+COMMENT= Light, Unobtrusive, and configurable windowmanager
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed
USE_BZIP2= yes
-USE_GMAKE= yes
USE_XORG= xft xpm x11
+USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
- --enable-xft --disable-pcre --enable-image-xpm \
- --enable-image-jpeg --enable-image-png --disable-debug \
+ --enable-xft --enable-image-xpm --enable-image-jpeg \
+ --enable-image-png --disable-debug \
--disable-pedantic --enable-menus --enable-harbour
+CFLAGS+= -DICONV_CONST
MAN1= pekwm.1
MANCOMPRESSED= no
-post-install:
- @${STRIP_CMD} ${PREFIX}/bin/pekwm
+post-configure:
+ @${REINPLACE_CMD} 's|-lX11|-liconv -lX11|' ${WRKSRC}/src/Makefile
.include <bsd.port.mk>
diff --git a/x11-wm/pekwm/distinfo b/x11-wm/pekwm/distinfo
index 348f8a906761..5405e500b415 100644
--- a/x11-wm/pekwm/distinfo
+++ b/x11-wm/pekwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (pekwm-0.1.6.tar.bz2) = 551358cbe15cfe7be3a7f614c49c1d00
-SHA256 (pekwm-0.1.6.tar.bz2) = 2cf2f3a59c83273c022419d50e627b9e8f1f629cad89c1c91dffe7a4bc1b4c44
-SIZE (pekwm-0.1.6.tar.bz2) = 275703
+MD5 (pekwm-0.1.7.tar.bz2) = 30acfa41a5005a9f31117041ec32eb0d
+SHA256 (pekwm-0.1.7.tar.bz2) = 2216eb0c722f4aad15761a7f4eced67ea1284a00e32e03d66de4b55f8c1c9524
+SIZE (pekwm-0.1.7.tar.bz2) = 363788
diff --git a/x11-wm/pekwm/files/patch-aa b/x11-wm/pekwm/files/patch-aa
deleted file mode 100644
index 48693ab4ce71..000000000000
--- a/x11-wm/pekwm/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/scripts/pekwm_themeset.pl.orig Sun Feb 27 14:52:08 2005
-+++ data/scripts/pekwm_themeset.pl Sun Mar 13 16:38:13 2005
-@@ -51,7 +51,7 @@
- close $fh
- or die "Failed to write $cfg_file successfully: $!\n";
-
-- system 'pkill', -HUP => 'pekwm'; # tell pekwm to reread its config
-+ system("killall -HUP pekwm"); # tell pekwm to reread its config
- }
-
- if( @ARGV == 1 ) {
diff --git a/x11-wm/pekwm/files/patch-ab b/x11-wm/pekwm/files/patch-ab
deleted file mode 100644
index 4092b657b96b..000000000000
--- a/x11-wm/pekwm/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/scripts/pekwm_themeset.sh.orig Tue Jan 13 06:42:34 2004
-+++ data/scripts/pekwm_themeset.sh Tue Dec 21 06:27:44 2004
-@@ -44,7 +44,7 @@
- sed -e "s/Theme\ =\ \".*\"/Theme\ =\ \"$THEME\"/" $PEKWM_CONFIG_FILE > $TMPFILE;
- cp $TMPFILE $PEKWM_CONFIG_FILE;
- rm $TMPFILE
-- pkill -HUP pekwm;
-+ killall -HUP pekwm;
- fi;
-
- exit 0
diff --git a/x11-wm/pekwm/files/patch-data-scripts-pekwm_themeset.sh b/x11-wm/pekwm/files/patch-data-scripts-pekwm_themeset.sh
new file mode 100644
index 000000000000..bd2ba708b006
--- /dev/null
+++ b/x11-wm/pekwm/files/patch-data-scripts-pekwm_themeset.sh
@@ -0,0 +1,12 @@
+--- data/scripts/pekwm_themeset.sh.in.orig 2008-08-07 01:54:14.000000000 +0200
++++ data/scripts/pekwm_themeset.sh.in 2008-08-07 01:55:00.000000000 +0200
+@@ -46,7 +46,8 @@
+ fi
+
+ # Change theme
+- sed -e "s/^\([^#]*\)Theme\ =\ \"[^\"]*\"/\\1Theme\ =\ \"${theme}\"/i" "${PEKWM_CONFIG_FILE}" > "${tmp_file}"
++ gsed -e "s/^\([^#]*\)Theme\ =\ \"[^\"]*\"/\\1Theme\ =\ \"${theme}\"/i" "${PEKWM_CONFIG_FILE}" > "${tmp_file}"
++ cp "${PEKWM_CONFIG_FILE}" "${PEKWM_CONFIG_FILE}".bak
+ mv "${tmp_file}" "${PEKWM_CONFIG_FILE}"
+
+ # Reload pekwm
diff --git a/x11-wm/pekwm/pkg-descr b/x11-wm/pekwm/pkg-descr
index 8e4a6c893b46..a288831ca40d 100644
--- a/x11-wm/pekwm/pkg-descr
+++ b/x11-wm/pekwm/pkg-descr
@@ -11,4 +11,4 @@ o Automatic properties, for all the lazy people, make things appear as
they should when starting applications.
o Chainable Keygrabber, usability for everyone.
-WWW: https://projects.pekdon.net/projects/3
+WWW: http://pekwm.org/
diff --git a/x11-wm/pekwm/pkg-plist b/x11-wm/pekwm/pkg-plist
index e725ac513d7a..fb9cd9d3625e 100644
--- a/x11-wm/pekwm/pkg-plist
+++ b/x11-wm/pekwm/pkg-plist
@@ -1,17 +1,16 @@
bin/pekwm
-etc/pekwm/autoproperties
-etc/pekwm/config
-etc/pekwm/keys
-etc/pekwm/menu
-etc/pekwm/mouse
-etc/pekwm/start
-etc/pekwm/vars
-%%DATADIR%%/scripts/pekwm_themeset.pl
-%%DATADIR%%/scripts/pekwm_themeset.sh
-%%DATADIR%%/scripts/pekwm_ws_menu.pl
+%%ETCDIR%%/autoproperties
+%%ETCDIR%%/config
+%%ETCDIR%%/keys
+%%ETCDIR%%/menu
+%%ETCDIR%%/mouse
+%%ETCDIR%%/start
+%%ETCDIR%%/vars
%%DATADIR%%/themes/default/theme
+%%DATADIR%%/scripts/pekwm_ws_menu.sh
+%%DATADIR%%/scripts/pekwm_themeset.sh
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/themes/default
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%
-@dirrm etc/pekwm
+@dirrm %%ETCDIR%%