summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-10-15 10:09:09 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-10-15 10:09:09 +0000
commit0f15311bd697118595e6fa434b232b4934ff1616 (patch)
tree32c58a02032d4173644bade1e0ae259b19c53ae4 /x11-wm
parent- Location of librep's files has been changes to not hardcode minor release (diff)
Update to 1.0.1.
Notes
Notes: svn path=/head/; revision=48778
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/sawfish/Makefile13
-rw-r--r--x11-wm/sawfish/distinfo2
-rw-r--r--x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::gnome.jl21
-rw-r--r--x11-wm/sawfish/pkg-plist6
-rw-r--r--x11-wm/sawfish2/Makefile13
-rw-r--r--x11-wm/sawfish2/distinfo2
-rw-r--r--x11-wm/sawfish2/files/patch-lisp::sawfish::wm::state::gnome.jl21
-rw-r--r--x11-wm/sawfish2/pkg-plist6
8 files changed, 22 insertions, 62 deletions
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index f60633a1952c..498ae042c160 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -6,19 +6,19 @@
#
PORTNAME= sawfish
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sawmill
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= rep.10:${PORTSDIR}/lang/librep
-BUILD_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
-RUN_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
+LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep
+BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
+RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
-PLIST_SUB= GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION}
+GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
+PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -30,6 +30,7 @@ CONFIGURE_ARGS= --with-readline \
--datadir=${PREFIX}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET= ${ARCH}-freebsd${OSREL:C/\..*//}
.include <bsd.port.pre.mk>
diff --git a/x11-wm/sawfish/distinfo b/x11-wm/sawfish/distinfo
index 2f0ed2fc6b11..705cfda9c8f6 100644
--- a/x11-wm/sawfish/distinfo
+++ b/x11-wm/sawfish/distinfo
@@ -1 +1 @@
-MD5 (sawfish-1.0.tar.gz) = ad0b179620ef9d8aeea692b56ab6a302
+MD5 (sawfish-1.0.1.tar.gz) = b1587ea76cca08ec951f2536c17a307e
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::gnome.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::gnome.jl
deleted file mode 100644
index 12613735f003..000000000000
--- a/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::gnome.jl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- lisp/sawfish/wm/state/gnome.jl.orig Fri May 4 10:41:32 2001
-+++ lisp/sawfish/wm/state/gnome.jl Tue Aug 28 19:42:30 2001
-@@ -1,5 +1,5 @@
- ;; gnome.jl -- minimal GNOME compliance
--;; $Id: gnome.jl,v 1.72 2001/05/04 07:41:32 jsh Exp $
-+;; $Id: gnome.jl,v 1.73 2001/07/24 04:37:14 jsh Exp $
-
- ;; Copyright (C) 1999 John Harper <john@dcs.warwick.ac.uk>
-
-@@ -321,7 +321,7 @@
- (let ((event (event-name (current-event))))
- ;; only proxy Click1 or Off events, and only if we don't have
- ;; a binding for an event that may follow in the same grab
-- (cond ((and (string-match "^(.*)-Click1$" event)
-+ (cond ((and (string-match "^(.*)-Click\\d?$" event)
- (let ((mirror (lookup-event
- (expand-last-match "\\1-Off"))))
- (not (or (search-keymap mirror global-keymap)
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 618c0b5e9c77..13d7f3060fea 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -91,8 +91,8 @@ share/locale/ko/LC_MESSAGES/sawfish.mo
share/locale/nl/LC_MESSAGES/sawfish.mo
share/locale/no/LC_MESSAGES/sawfish.mo
share/locale/pl/LC_MESSAGES/sawfish.mo
+share/locale/pt/LC_MESSAGES/sawfish.mo
share/locale/pt_BR/LC_MESSAGES/sawfish.mo
-share/locale/pt_PT/LC_MESSAGES/sawfish.mo
share/locale/ro/LC_MESSAGES/sawfish.mo
share/locale/ru/LC_MESSAGES/sawfish.mo
share/locale/sk/LC_MESSAGES/sawfish.mo
@@ -101,8 +101,8 @@ share/locale/sv/LC_MESSAGES/sawfish.mo
share/locale/tr/LC_MESSAGES/sawfish.mo
share/locale/uk/LC_MESSAGES/sawfish.mo
share/locale/wa/LC_MESSAGES/sawfish.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/sawfish.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sawfish.mo
+share/locale/zh_CN/LC_MESSAGES/sawfish.mo
+share/locale/zh_TW/LC_MESSAGES/sawfish.mo
share/sawfish/%%VERSION%%/lisp/anim-outline.jl
share/sawfish/%%VERSION%%/lisp/anim-outline.jlc
share/sawfish/%%VERSION%%/lisp/audio-events.jl
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index f60633a1952c..498ae042c160 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -6,19 +6,19 @@
#
PORTNAME= sawfish
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sawmill
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= rep.10:${PORTSDIR}/lang/librep
-BUILD_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
-RUN_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
+LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep
+BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
+RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
-PLIST_SUB= GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION}
+GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
+PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -30,6 +30,7 @@ CONFIGURE_ARGS= --with-readline \
--datadir=${PREFIX}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET= ${ARCH}-freebsd${OSREL:C/\..*//}
.include <bsd.port.pre.mk>
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index 2f0ed2fc6b11..705cfda9c8f6 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (sawfish-1.0.tar.gz) = ad0b179620ef9d8aeea692b56ab6a302
+MD5 (sawfish-1.0.1.tar.gz) = b1587ea76cca08ec951f2536c17a307e
diff --git a/x11-wm/sawfish2/files/patch-lisp::sawfish::wm::state::gnome.jl b/x11-wm/sawfish2/files/patch-lisp::sawfish::wm::state::gnome.jl
deleted file mode 100644
index 12613735f003..000000000000
--- a/x11-wm/sawfish2/files/patch-lisp::sawfish::wm::state::gnome.jl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- lisp/sawfish/wm/state/gnome.jl.orig Fri May 4 10:41:32 2001
-+++ lisp/sawfish/wm/state/gnome.jl Tue Aug 28 19:42:30 2001
-@@ -1,5 +1,5 @@
- ;; gnome.jl -- minimal GNOME compliance
--;; $Id: gnome.jl,v 1.72 2001/05/04 07:41:32 jsh Exp $
-+;; $Id: gnome.jl,v 1.73 2001/07/24 04:37:14 jsh Exp $
-
- ;; Copyright (C) 1999 John Harper <john@dcs.warwick.ac.uk>
-
-@@ -321,7 +321,7 @@
- (let ((event (event-name (current-event))))
- ;; only proxy Click1 or Off events, and only if we don't have
- ;; a binding for an event that may follow in the same grab
-- (cond ((and (string-match "^(.*)-Click1$" event)
-+ (cond ((and (string-match "^(.*)-Click\\d?$" event)
- (let ((mirror (lookup-event
- (expand-last-match "\\1-Off"))))
- (not (or (search-keymap mirror global-keymap)
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 618c0b5e9c77..13d7f3060fea 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -91,8 +91,8 @@ share/locale/ko/LC_MESSAGES/sawfish.mo
share/locale/nl/LC_MESSAGES/sawfish.mo
share/locale/no/LC_MESSAGES/sawfish.mo
share/locale/pl/LC_MESSAGES/sawfish.mo
+share/locale/pt/LC_MESSAGES/sawfish.mo
share/locale/pt_BR/LC_MESSAGES/sawfish.mo
-share/locale/pt_PT/LC_MESSAGES/sawfish.mo
share/locale/ro/LC_MESSAGES/sawfish.mo
share/locale/ru/LC_MESSAGES/sawfish.mo
share/locale/sk/LC_MESSAGES/sawfish.mo
@@ -101,8 +101,8 @@ share/locale/sv/LC_MESSAGES/sawfish.mo
share/locale/tr/LC_MESSAGES/sawfish.mo
share/locale/uk/LC_MESSAGES/sawfish.mo
share/locale/wa/LC_MESSAGES/sawfish.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/sawfish.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sawfish.mo
+share/locale/zh_CN/LC_MESSAGES/sawfish.mo
+share/locale/zh_TW/LC_MESSAGES/sawfish.mo
share/sawfish/%%VERSION%%/lisp/anim-outline.jl
share/sawfish/%%VERSION%%/lisp/anim-outline.jlc
share/sawfish/%%VERSION%%/lisp/audio-events.jl