Date: Mon, 13 Feb 2006 03:01:01 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/93247: Update port: x11-wm/matchbox to 0.9.5 Message-ID: <20060213030101.48487707.tkato432@yahoo.com> Resent-Message-ID: <200602121810.k1CIA8aW096359@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93247 >Category: ports >Synopsis: Update port: x11-wm/matchbox to 0.9.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 12 18:10:07 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p14 i386 >Organization: >Environment: >Description: - Update to version 0.9.5 Remove file: files/patch-src_misc.h files/patch-src_toolbar_client.h files/patch-src_wm.h files/patch-util_monolaunch.c >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/matchbox/Makefile x11-wm/matchbox/Makefile --- /usr/ports/x11-wm/matchbox/Makefile Sun Feb 12 14:34:13 2006 +++ x11-wm/matchbox/Makefile Sun Feb 12 21:07:42 2006 @@ -6,65 +6,49 @@ # PORTNAME= matchbox -PORTVERSION= 0.3 +PORTVERSION= 0.9.5 CATEGORIES= x11-wm -MASTER_SITES= http://handhelds.org/~mallum/downloadables/matchbox/ +MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/%SUBDIR%/ +MASTER_SITE_SUBDIR= ${PORTVERSION:R} +DISTNAME= ${PORTNAME}-window-manager-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Window manager suitable for low-resolution screens -DOCS= AUTHORS COPYING ChangeLog NEWS README TODO -CONFIGURE_ARGS= --prefix=${PREFIX} -GNU_CONFIGURE= yes -MAN1= matchbox.1 mbcontrol.1 monolaunch.1 miniapm.1 minisys.1 minitime.1 minivol.1 -PLIST= ${WRKDIR}/pkg-plist +USE_BZIP2= yes USE_X_PREFIX= yes +USE_GNOME= gnometarget +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -pre-install: - ${ECHO_CMD} bin/matchbox > ${PLIST} -.for ii in minitime minisys minivol monolaunch mbcontrol mbdock - ${ECHO_CMD} bin/${ii} >> ${PLIST} -.endfor -.for ii in defaults icon.xpm - ${ECHO_CMD} share/matchbox/${ii} >> ${PLIST} -.endfor -.for ii in mbdock themes - cd ${WRKSRC}/data/${ii} && ${FIND} -s . -type f | \ - ${CUT} -c3-999 | \ - ${SED} -e 's:^:share/matchbox/${ii}/:' >> ${PLIST} \ - && ${FIND} -d . -type d | \ - ${CUT} -c3-999 | \ - ${SED} -e 's:^:@dirrm share/matchbox/${ii}/:' >> ${PLIST} -.endfor -.if !defined(NOPORTDOCS) -.for ii in ${DOCS} - ${ECHO_CMD} share/doc/matchbox/${ii} >> ${PLIST} -.endfor - ${ECHO_CMD} @dirrm share/doc/matchbox >> ${PLIST} +PORTDOCS= ${DOCS} +PLIST_FILES= bin/matchbox-window-manager bin/matchbox-remote \ + etc/matchbox/kbdconfig +PLIST_DIRS= etc/matchbox + +DOCS= AUTHORS ChangeLog NEWS README + +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT) +CONFIGURE_ARGS+= --enable-standalone +.else +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +CONFIGURE_ARGS+= --enable-standalone-xft .endif - ${ECHO_CMD} @dirrm share/matchbox >> ${PLIST} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/matchbox ${PREFIX}/bin -.for ii in minitime minisys minivol monolaunch mbcontrol - ${INSTALL_PROGRAM} ${WRKSRC}/util/${ii} ${PREFIX}/bin -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/dock/mbdock ${PREFIX}/bin - ${MKDIR} ${DATADIR} - cd ${WRKSRC}/data/ && ${PAX} -r -w themes ${DATADIR} \ - && ${PAX} -r -w mbdock ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/src/matchbox-remote ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/matchbox-window-manager ${PREFIX}/bin + @${MKDIR} ${PREFIX}/etc/matchbox + ${INSTALL_DATA} ${WRKSRC}/data/kbdconfig ${PREFIX}/etc/matchbox .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for ii in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} +.for i in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.for ii in defaults icon.xpm - ${INSTALL_DATA} ${WRKSRC}/data/${ii} ${DATADIR} -.endfor -.for ii in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/doc/${ii} ${PREFIX}/man/man1/ -.endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -urN /usr/ports/x11-wm/matchbox/distinfo x11-wm/matchbox/distinfo --- /usr/ports/x11-wm/matchbox/distinfo Sun Jan 8 15:14:48 2006 +++ x11-wm/matchbox/distinfo Sun Feb 12 20:13:33 2006 @@ -1,3 +1,3 @@ -MD5 (matchbox-0.3.tar.gz) = 6a14ff325653a601d7643b1b0a627091 -SHA256 (matchbox-0.3.tar.gz) = ad5037e72abf5e38d4742d2e9821ccb07feac2a337022704880ae2df23fde51b -SIZE (matchbox-0.3.tar.gz) = 192431 +MD5 (matchbox-window-manager-0.9.5.tar.bz2) = a992bda42a5f46c648fbaf007e8181db +SHA256 (matchbox-window-manager-0.9.5.tar.bz2) = 404b96e165c746f1e44102895349a8659ed628b2bd358d127b27d3f9b82fe4ac +SIZE (matchbox-window-manager-0.9.5.tar.bz2) = 194444 diff -urN /usr/ports/x11-wm/matchbox/files/patch-src_misc.h x11-wm/matchbox/files/patch-src_misc.h --- /usr/ports/x11-wm/matchbox/files/patch-src_misc.h Wed Sep 25 22:56:12 2002 +++ x11-wm/matchbox/files/patch-src_misc.h Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ -$FreeBSD: ports/x11-wm/matchbox/files/patch-src_misc.h,v 1.1 2002/09/25 13:56:12 trevor Exp $ - ---- src/misc.h.orig Sun May 26 16:45:09 2002 -+++ src/misc.h Wed Sep 25 13:24:24 2002 -@@ -52,5 +52,5 @@ int max_xstringChars(wm *w, int *width, - int max_xstringChars(wm *w, int *width, char *txt, XFontStruct* font_info); - #endif - void scale_icon(Client *c); --#endif _MISC_H_ -+#endif /* _MISC_H_ */ - diff -urN /usr/ports/x11-wm/matchbox/files/patch-src_toolbar_client.h x11-wm/matchbox/files/patch-src_toolbar_client.h --- /usr/ports/x11-wm/matchbox/files/patch-src_toolbar_client.h Wed Sep 25 22:56:12 2002 +++ x11-wm/matchbox/files/patch-src_toolbar_client.h Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ -$FreeBSD: ports/x11-wm/matchbox/files/patch-src_toolbar_client.h,v 1.1 2002/09/25 13:56:12 trevor Exp $ - ---- src/toolbar_client.h.orig Wed Feb 13 17:04:26 2002 -+++ src/toolbar_client.h Wed Sep 25 13:23:32 2002 -@@ -42,4 +42,4 @@ void toolbar_client_reparent(Client *c); - void toolbar_client_redraw(Client *c, Bool use_cache); - int toolbar_win_offset(Client *c); - --#endif _TOOLBAR_CLIENT_H_ -+#endif /* _TOOLBAR_CLIENT_H_ */ diff -urN /usr/ports/x11-wm/matchbox/files/patch-src_wm.h x11-wm/matchbox/files/patch-src_wm.h --- /usr/ports/x11-wm/matchbox/files/patch-src_wm.h Wed Sep 25 22:56:12 2002 +++ x11-wm/matchbox/files/patch-src_wm.h Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ -$FreeBSD: ports/x11-wm/matchbox/files/patch-src_wm.h,v 1.1 2002/09/25 13:56:12 trevor Exp $ - ---- src/wm.h.orig Mon Jun 24 08:27:44 2002 -+++ src/wm.h Wed Sep 25 13:23:43 2002 -@@ -86,4 +86,4 @@ void wm_gravitate(Client *c, int multipl - void wm_init_existing(Wm *w); - int wm_total_dock_height(Client *c); - void wm_toggle_desktop(Wm *w); --#endif _WM_H_ -+#endif /* _WM_H_ */ diff -urN /usr/ports/x11-wm/matchbox/files/patch-util_monolaunch.c x11-wm/matchbox/files/patch-util_monolaunch.c --- /usr/ports/x11-wm/matchbox/files/patch-util_monolaunch.c Mon Jul 15 13:31:33 2002 +++ x11-wm/matchbox/files/patch-util_monolaunch.c Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ -$FreeBSD: ports/x11-wm/matchbox/files/patch-util_monolaunch.c,v 1.1 2002/07/15 04:31:33 trevor Exp $ - ---- util/monolaunch.c.orig Wed Jul 10 06:38:02 2002 -+++ util/monolaunch.c Sun Jul 14 20:41:16 2002 -@@ -20,14 +20,12 @@ - */ - - #include <stdlib.h> --#include <getopt.h> - #include <string.h> - #include <fcntl.h> - #include <stdio.h> - #include <errno.h> - #include <sys/types.h> - #include <sys/stat.h> --#include <sys/sysmacros.h> - #include <signal.h> - #include <X11/X.h> - #include <X11/Xlib.h> diff -urN /usr/ports/x11-wm/matchbox/pkg-descr x11-wm/matchbox/pkg-descr --- /usr/ports/x11-wm/matchbox/pkg-descr Thu Apr 8 13:25:42 2004 +++ x11-wm/matchbox/pkg-descr Mon Feb 13 02:14:26 2006 @@ -11,4 +11,4 @@ The dock may be used with the metacity window manager. Matchbox is compatible with the GNOME and KDE panels. -WWW: http://matchbox.handhelds.org +WWW: http://projects.o-hand.com/matchbox/ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060213030101.48487707.tkato432>