aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-07-24 17:00:50 +0800
committersobomax <sobomax@FreeBSD.org>2001-07-24 17:00:50 +0800
commit222db2a051dd987aa23231ca144fc52221bd1d72 (patch)
treec4b06a4247750a95267fb054c0bfacfc3ec029c9 /x11-wm
parentf66e498c075ce0aefce573ac4df771c592323b63 (diff)
downloadfreebsd-ports-graphics-222db2a051dd987aa23231ca144fc52221bd1d72.tar.gz
freebsd-ports-graphics-222db2a051dd987aa23231ca144fc52221bd1d72.tar.zst
freebsd-ports-graphics-222db2a051dd987aa23231ca144fc52221bd1d72.zip
Update to 0.65.1.
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/windowmaker/Makefile12
-rw-r--r--x11-wm/windowmaker/distinfo2
-rw-r--r--x11-wm/windowmaker/files/patch-po::Makefile.in18
-rw-r--r--x11-wm/windowmaker/files/patch-sec175
-rw-r--r--x11-wm/windowmaker/files/patch-util_wmaker.inst.in14
-rw-r--r--x11-wm/windowmaker/files/patch-wsetfont127
-rw-r--r--x11-wm/windowmaker/pkg-plist3
7 files changed, 29 insertions, 222 deletions
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index eaa1080e766..a9d3c34eafd 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= windowmaker
-PORTVERSION= 0.65.0
-PORTREVISION= 2
+PORTVERSION= 0.65.1
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER}
MASTER_SITE_SUBDIR= beta/srcs
@@ -15,6 +14,7 @@ DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
@@ -31,9 +31,11 @@ WANT_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= X11BASE=${X11BASE} \
- LIBS="-L${LOCALBASE}/lib" \
+ LIBS="-L${LOCALBASE}/lib -lintl" \
CPPFLAGS="-I${LOCALBASE}/include" \
- LINGUAS="${LINGUAS}"
+ LINGUAS="${LINGUAS}" \
+ MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+ XGETTEXT=${LOCALBASE}/bin/xgettext-new
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-nlsdir=${PREFIX}/share/locale \
--with-libs-from="-L${LOCALBASE}/lib" \
@@ -42,6 +44,7 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--enable-hermes \
--disable-debug
+MANLANG= "" sk
MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x
@@ -56,7 +59,6 @@ CONFIGURE_ARGS+= --enable-gnome
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde
.else
-.SILENT:
pre-extract:
@${ECHO} "You can add hooks for KDE by defining WITH_KDE"
.endif
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 247107c2437..63598896dfc 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.65.0.tar.bz2) = d17f6b206db4c4157248e36422fc9cbb
+MD5 (WindowMaker-0.65.1.tar.bz2) = ab1d08b08366be74275aa38ff09d809b
diff --git a/x11-wm/windowmaker/files/patch-po::Makefile.in b/x11-wm/windowmaker/files/patch-po::Makefile.in
new file mode 100644
index 00000000000..c6f82604b42
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-po::Makefile.in
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- po/Makefile.in 2001/07/24 08:40:08 1.1
++++ po/Makefile.in 2001/07/24 08:40:37
+@@ -215,10 +215,10 @@
+
+
+ .po.mo:
+- msgfmt -o $@ $<
++ msgfmt-new -o $@ $<
+
+ WindowMaker.pot: $(POTFILES)
+- xgettext --default-domain=WindowMaker \
++ $(XGETTEXT) --default-domain=WindowMaker \
+ --add-comments --keyword=_ $(POTFILES)
+ if cmp -s WindowMaker.po WindowMaker.pot; then \
+ rm -f WindowMaker.po; \
diff --git a/x11-wm/windowmaker/files/patch-sec1 b/x11-wm/windowmaker/files/patch-sec1
deleted file mode 100644
index 14cadea6634..00000000000
--- a/x11-wm/windowmaker/files/patch-sec1
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/switchmenu.c Thu Apr 19 22:22:42 2001
-+++ src/switchmenu.c Mon Jul 23 14:55:39 2001
-@@ -181,6 +181,7 @@
- WMenu *switchmenu = scr->switch_menu;
- WMenuEntry *entry;
- char title[MAX_MENU_TEXT_LENGTH+6];
-+ int len = MAX_MENU_TEXT_LENGTH+6;
- int i;
- int checkVisibility = 0;
-
-@@ -203,9 +204,9 @@
- return;
-
- if (wwin->frame->title)
-- sprintf(title, "%s", wwin->frame->title);
-+ snprintf(title, len, "%s", wwin->frame->title);
- else
-- sprintf(title, "%s", DEF_WINDOW_TITLE);
-+ snprintf(title, len, "%s", DEF_WINDOW_TITLE);
- t = ShrinkString(scr->menu_entry_font, title, MAX_WINDOWLIST_WIDTH);
-
- if (IS_OMNIPRESENT(wwin))
-@@ -220,9 +221,9 @@
- entry->flags.indicator = 1;
- entry->rtext = wmalloc(MAX_WORKSPACENAME_WIDTH+8);
- if (IS_OMNIPRESENT(wwin))
-- sprintf(entry->rtext, "[*]");
-+ snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH, "[*]");
- else
-- sprintf(entry->rtext, "[%s]",
-+ snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH, "[%s]",
- scr->workspaces[wwin->frame->workspace]->name);
-
- if (wwin->flags.hidden) {
-@@ -259,9 +260,11 @@
- wfree(entry->text);
-
- if (wwin->frame->title)
-- sprintf(title, "%s", wwin->frame->title);
-+ snprintf(title, MAX_MENU_TEXT_LENGTH, "%s",
-+ wwin->frame->title);
- else
-- sprintf(title, "%s", DEF_WINDOW_TITLE);
-+ snprintf(title, MAX_MENU_TEXT_LENGTH, "%s",
-+ DEF_WINDOW_TITLE);
-
- t = ShrinkString(scr->menu_entry_font, title, MAX_WINDOWLIST_WIDTH);
- entry->text = t;
-@@ -277,10 +280,11 @@
- int it, ion;
-
- if (IS_OMNIPRESENT(wwin)) {
-- sprintf(entry->rtext, "[*]");
-+ snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH,
-+ "[*]");
- } else {
-- sprintf(entry->rtext, "[%s]",
-- scr->workspaces[wwin->frame->workspace]->name);
-+ snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH,
-+ "[%s]", scr->workspaces[wwin->frame->workspace]->name);
- }
-
- rt = entry->rtext;
-@@ -361,9 +365,9 @@
- if (wwin->frame->workspace==workspace
- && !IS_OMNIPRESENT(wwin)) {
- if (IS_OMNIPRESENT(wwin))
-- sprintf(menu->entries[i]->rtext, "[*]");
-+ snprintf(menu->entries[i]->rtext, MAX_WORKSPACENAME_WIDTH,"[*]");
- else
-- sprintf(menu->entries[i]->rtext, "[%s]",
-+ snprintf(menu->entries[i]->rtext, MAX_WORKSPACENAME_WIDTH,"[%s]",
- scr->workspaces[wwin->frame->workspace]->name);
- menu->flags.realized = 0;
- }
diff --git a/x11-wm/windowmaker/files/patch-util_wmaker.inst.in b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
deleted file mode 100644
index da4a858365c..00000000000
--- a/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- util/wmaker.inst.in 2001/02/19 20:05:14 1.1
-+++ util/wmaker.inst.in 2001/02/19 20:05:29
-@@ -293,7 +293,7 @@
- echo "menu that will be used by default is the property list one. Read"
- echo " $GSDIR/Library/WindowMaker/README"
- echo "for information on how to change it."
-- if [ "${inst_menu%.*}" == "menu" ]; then
-+ if [ "${inst_menu%.*}" = "menu" ]; then
- echo "However, since you have locale set to $LOCALE and plmenu for such locale"
- echo "was not found, your WMRootMenu contains path to text formated menu:"
- echo " $GSDIR/Library/WindowMaker/$inst_menu"
diff --git a/x11-wm/windowmaker/files/patch-wsetfont b/x11-wm/windowmaker/files/patch-wsetfont
deleted file mode 100644
index b2d89dd0deb..00000000000
--- a/x11-wm/windowmaker/files/patch-wsetfont
+++ /dev/null
@@ -1,127 +0,0 @@
---- util/wsetfont.orig Fri May 18 22:09:24 2001
-+++ util/wsetfont Fri May 18 22:09:40 2001
-@@ -77,7 +77,7 @@
- "--auto")
- auto="YES";;
- *)
-- if echo $i |grep "^--locale=" &>/dev/null; then
-+ if echo $i |grep "^--locale=" >/dev/null 2>&1; then
- new_locale=$(echo $i |sed -e "s|--locale=||" -)
- elif [ -z $family ]; then
- family=$i
-@@ -115,7 +115,7 @@
-
- for i in $DomainNames; do
- tmp="Domain$i"
-- AllKeys="$AllKeys ${!tmp}"
-+ AllKeys="$AllKeys `eval echo '${'$tmp'}'`"
- done
-
- #
-@@ -212,8 +212,8 @@
- family="default"
- else
- for i in $all_codings; do
-- for j in ${!i}; do
-- if [ "$j" == "${locale%_*}" ]; then
-+ for j in `eval echo '${'$i'}'`; do
-+ if [ "$j" = "${locale%_*}" ]; then
- family="$i"
- break 2
- fi
-@@ -227,7 +227,7 @@
- #
- is_supported=""
- for i in $Supported; do
-- if test "$family" == "$i"; then
-+ if test "$family" = "$i"; then
- is_supported="YES"
- break
- fi
-@@ -245,7 +245,7 @@
- #
- is_nodef_unable=""
- for i in $NodefUnable; do
-- if test "$family" == "$i"; then
-+ if test "$family" = "$i"; then
- if test -n "$nodef"; then # --nodef with one from $NodefUnable
- echo -e "\n"\
- "Sorry, --nodef argument is not allowed for these font codings:\n"\
-@@ -268,22 +268,22 @@
- for i in $AllKeys; do
- if test -n "$is_nodef_unable"; then # japanese,... defaults
- tmp="$family$i"
-- eval $i=${!tmp}
-+ eval $i=`eval echo '${'$tmp'}'`
- else # rest, load defaults
- not_font=""
- for j in $NotFont; do
-- if test "$i" == "$j"; then
-+ if test "$i" = "$j"; then
- not_font="YES"
- break
- fi
- done
- if test -n "$not_font"; then # don't append coding (not default!)
- tmp="${family}$i"
-- eval $i="${!tmp}"
-+ eval $i="`eval echo '${'$tmp'}'`"
- else # append coding
- tmp="Default$i"
- tmp1="${family}Coding"
-- eval $i="${!tmp}${!tmp1}"
-+ eval $i="`eval echo '${'$tmp'}${'$tmp1'}'`"
- fi
- fi
- done
-@@ -305,36 +305,38 @@
- echo
- echo "Setting up $i domain file..."
- tmp="Domain$i"
-- for j in ${!tmp}; do
-+ for j in `eval echo '${'$tmp'}'`; do
- if test -n "$nodef"; then # --nodef, change coding only
- not_font=""
- for k in $NotFont; do
-- if test "$k" == "$j"; then
-+ if test "$k" = "$j"; then
- not_font="YES"
- break;
- fi
- done
- if test -n "$not_font"; then # don't append coding
- tmp1="${family}$j"
-- eval $j=${!tmp1}
-+ eval $j=`eval echo '${'$tmp1'}'`
- else # append coding
- #TODO:make this funny sed script a lot smarter to let us make changes in font
- # lists, etc... (then we can enable --nodef for NodefUnable codings)
- #TODO:better (or at least any) check, whether wmaker is installed...
-- tmp1="${family}Coding"
-- eval $j=$($WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${!tmp1}/g")
-- if test -z "${!j}"; then # failed, load default
-+ tmp1="`eval echo '${'${family}Coding'}'`"
-+ eval $j=`$WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${tmp1}/g"`
-+ if test -z "`eval echo '${'$j'}'`"; then # failed, load default
- tmp2="Default$j"
-- eval $j=${!tmp2}
-+ eval $j=`eval echo '${'$tmp2'}'`
- fi
- fi
- fi
-- tmp1="$j=\"${!j}\"" # cosmetic length workaround
-- if (( ${#tmp1} > 80 )); then
-- tmp1=$(echo "${tmp1:0:76}...\"")
-+ tmp1="$j=\"`eval echo '${'$j'}'`\"" # cosmetic length workaround
-+ echo '<<<<'
-+ if [ ${#tmp1} -lt 80 ]; then
-+ tmp1=`echo $tmp1 | sed -e 's/^\(.\{1,76\}\).*/\1/'`
- fi
-+ echo '>>>>'
- echo "$tmp1"
-- $WDWRITE $i $j \"${!j}\"
-+ $WDWRITE $i $j \"`eval echo '${'$j'}'`\"
- done
- done
- echo
-
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 5e9b063c773..d0aef6ee450 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -257,6 +257,7 @@ share/WindowMaker/plmenu.fi
share/WindowMaker/plmenu.fr
share/WindowMaker/plmenu.hr
share/WindowMaker/plmenu.it
+share/WindowMaker/plmenu.ja
share/WindowMaker/plmenu.ko
share/WindowMaker/plmenu.pl
share/WindowMaker/plmenu.ro
@@ -298,6 +299,7 @@ share/locale/pt/LC_MESSAGES/WindowMaker.mo
share/locale/ro/LC_MESSAGES/WindowMaker.mo
share/locale/ru/LC_MESSAGES/WPrefs.mo
share/locale/ru/LC_MESSAGES/WindowMaker.mo
+share/locale/sk/LC_MESSAGES/WINGs.mo
share/locale/sk/LC_MESSAGES/WPrefs.mo
share/locale/sk/LC_MESSAGES/WindowMaker.mo
share/locale/sv/LC_MESSAGES/WindowMaker.mo
@@ -306,6 +308,7 @@ share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
share/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo
share/locale/zh_TW.Big5/LC_MESSAGES/WindowMaker.mo
+@exec mkdir -p %D/GNUstep/Apps/WPrefs.app/xpm
@exec mkdir -p %D/share/WindowMaker/Sounds
@dirrm share/WindowMaker/Styles
@dirrm share/WindowMaker/Sounds