diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-04 07:23:53 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-04 07:23:53 +0000 |
commit | 569cce6a385f8a6d152d9a863e6d9b03498818be (patch) | |
tree | 89069032bc802b4d4b116625e97d8be73805ef4d /x11-wm/sawfish2 | |
parent | Add a patch forgotten in the last commit. (diff) |
Update to 1.3.
Notes
Notes:
svn path=/head/; revision=78121
Diffstat (limited to 'x11-wm/sawfish2')
-rw-r--r-- | x11-wm/sawfish2/Makefile | 30 | ||||
-rw-r--r-- | x11-wm/sawfish2/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/sawfish2/files/patch-lisp_sawfish_wm_windows.jl | 11 | ||||
-rw-r--r-- | x11-wm/sawfish2/files/patch-src_gtk-style.c | 15 |
4 files changed, 21 insertions, 37 deletions
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index 0fbcffbf52fb..e3404bb09b1c 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -6,32 +6,32 @@ # PORTNAME= sawfish2 -PORTVERSION= 1.2 -PORTREVISION= 4 +PORTVERSION= 1.3 PORTEPOCH= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2 -DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}-gtk2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sawmill \ + sources/${PORTNAME:S/2$//}/1.3 +DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lisp configurable window manager -LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep \ - Xft.2:${PORTSDIR}/x11-fonts/Xft +LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2 RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2 GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//} -PLIST_SUB= GNUHOST=${GNUHOST} VERSION=1.2 +PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION} -USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gnomehier gnomehack +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-readline \ --localstatedir=${PREFIX}/share \ @@ -42,6 +42,16 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound +PKGNAMESUFFIX= -esound +CONFIGURE_ARGS+= --with-esd +.else +CONFIGURE_ARGS+= --without-esd +.endif + post-patch: @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ @@ -53,4 +63,4 @@ post-install: --entry="* sawfish: (sawfish). sawfish programming manual" \ ${PREFIX}/info/sawfish.info ${PREFIX}/info/dir -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo index 13883a13b7b3..1ae13cc2ea3c 100644 --- a/x11-wm/sawfish2/distinfo +++ b/x11-wm/sawfish2/distinfo @@ -1 +1 @@ -MD5 (gnome2/sawfish-1.2-gtk2.tar.bz2) = e6cf994eb60f5e3ddbec9cf5a4d38587 +MD5 (gnome2/sawfish-1.3.tar.gz) = 9e5ce5e76c60acecdb1889c1f173295a diff --git a/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_windows.jl b/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_windows.jl deleted file mode 100644 index 1ee60c9f51cb..000000000000 --- a/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_windows.jl +++ /dev/null @@ -1,11 +0,0 @@ ---- lisp/sawfish/wm/windows.jl.orig Thu Feb 13 12:54:55 2003 -+++ lisp/sawfish/wm/windows.jl Thu Feb 13 12:55:33 2003 -@@ -320,7 +320,7 @@ - (t x)))) - - (define (adjust-position-for-gravity/y w grav y #!key inverse) -- (let* ((tl-off (window-frame-offset w)) -+ (let* ((tl-off (cdr (window-frame-offset w))) - (br-off (- (cdr (window-frame-dimensions w)) - (cdr (window-dimensions w)))) - (sign (if inverse -1 +1))) diff --git a/x11-wm/sawfish2/files/patch-src_gtk-style.c b/x11-wm/sawfish2/files/patch-src_gtk-style.c deleted file mode 100644 index 6279de7f770e..000000000000 --- a/x11-wm/sawfish2/files/patch-src_gtk-style.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/gtk-style.c.orig Sat Feb 8 16:17:37 2003 -+++ src/gtk-style.c Sat Feb 8 16:18:39 2003 -@@ -97,12 +97,6 @@ - { - /* If GTK_MINOR_VERSION is not 2 we are using gtk+ 1.3.x or 2.0 - so these two members are no more */ --#if (GTK_MINOR_VERSION == 2) -- if (rc->font_name != 0) -- printf ("(font . \"%s\")\n", rc->font_name); -- if (rc->fontset_name != 0) -- printf ("(fontset . \"%s\")\n", rc->fontset_name); --#endif - if (print_rc_colors ("fg", rc->fg, 5, rc->color_flags, GTK_RC_FG)) - print_colors ("fg", style->fg, 5); - if (print_rc_colors ("bg", rc->bg, 5, rc->color_flags, GTK_RC_BG)) |