From d00818c1ee3da3920e8ebf18a9bab69247ee9dab Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 23 Apr 2008 22:18:27 +0000 Subject: [PATCH] - add Makefile.inc and use it - reformat some DESCR's - regen patches --- x11/matchbox/Makefile.inc | 15 +++++++++++++++ x11/matchbox/libfakekey/Makefile | 15 +++------------ x11/matchbox/libfakekey/pkg/DESCR | 4 ++-- x11/matchbox/libmatchbox/Makefile | 15 +++------------ x11/matchbox/matchbox-common/Makefile | 16 +++++----------- x11/matchbox/matchbox-desktop/Makefile | 15 +++------------ .../patches/patch-modules_dotdesktop_c | 8 ++++---- x11/matchbox/matchbox-keyboard/Makefile | 16 +++------------- .../matchbox-keyboard/patches/patch-Makefile_in | 6 +++--- x11/matchbox/matchbox-panel/Makefile | 16 +++------------- .../patches/patch-applets_Makefile_in | 6 +++--- .../matchbox-panel/patches/patch-configure | 10 +++++----- .../matchbox-panel/patches/patch-install-sh | 6 +++--- x11/matchbox/matchbox-window-manager/Makefile | 16 +++------------- .../patches/patch-data_Makefile_in | 12 ++++++------ 15 files changed, 64 insertions(+), 112 deletions(-) create mode 100644 x11/matchbox/Makefile.inc diff --git a/x11/matchbox/Makefile.inc b/x11/matchbox/Makefile.inc new file mode 100644 index 00000000000..932999eeb08 --- /dev/null +++ b/x11/matchbox/Makefile.inc @@ -0,0 +1,15 @@ +# $OpenBSD: Makefile.inc,v 1.1 2008/04/23 22:18:27 jasper Exp $ + +CATEGORIES?= x11 x11/matchbox + +HOMEPAGE?= http://projects.o-hand.com/matchbox/ + +MASTER_SITES_MATCHBOX= http://projects.o-hand.com/matchbox/sources/ + +# GPL/LGPL +PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE_FTP?= Yes +PERMIT_DISTFILES_CDROM?=Yes +PERMIT_DISTFILES_FTP?= Yes + +USE_X11?= Yes diff --git a/x11/matchbox/libfakekey/Makefile b/x11/matchbox/libfakekey/Makefile index 17270c1fe8a..d221d73cc1c 100644 --- a/x11/matchbox/libfakekey/Makefile +++ b/x11/matchbox/libfakekey/Makefile @@ -1,22 +1,13 @@ -# $OpenBSD: Makefile,v 1.5 2007/12/15 21:43:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2008/04/23 22:18:27 jasper Exp $ COMMENT= library for converting characters to X key-presses DISTNAME= libfakekey-0.1 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 SHARED_LIBS= fakekey 0.1 -CATEGORIES= x11 -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/libfakekey/0.1/ -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=libfakekey/0.1/} USE_LIBTOOL= Yes -USE_X11= Yes WANTLIB= X11 Xtst Xau Xdmcp Xext diff --git a/x11/matchbox/libfakekey/pkg/DESCR b/x11/matchbox/libfakekey/pkg/DESCR index db896712b2e..f682a33d5f8 100644 --- a/x11/matchbox/libfakekey/pkg/DESCR +++ b/x11/matchbox/libfakekey/pkg/DESCR @@ -1,2 +1,2 @@ -libfakekey is a library for converting UTF-8 characters -into 'fake' X key-presses. +libfakekey is a library for converting UTF-8 characters into 'fake' X +key-presses. diff --git a/x11/matchbox/libmatchbox/Makefile b/x11/matchbox/libmatchbox/Makefile index 3d0cda99eef..fcb1e568c0c 100644 --- a/x11/matchbox/libmatchbox/Makefile +++ b/x11/matchbox/libmatchbox/Makefile @@ -1,23 +1,14 @@ -# $OpenBSD: Makefile,v 1.7 2007/12/15 21:43:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2008/04/23 22:18:27 jasper Exp $ COMMENT= matchbox base library DISTNAME= libmatchbox-1.8 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 SHARED_LIBS= mb 1.7 MODGNU_SHARED_LIBS= mb '' -CATEGORIES= x11/matchbox -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/libmatchbox/1.8/ -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# LGPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=libmatchbox/1.8/} USE_LIBTOOL= Yes -USE_X11= Yes LIB_DEPENDS= pango-1.0.>=800.1,pangoft2-1.0.>=800.1,pangoxft-1.0.>=800.1::devel/pango \ jpeg.>=62::graphics/jpeg \ diff --git a/x11/matchbox/matchbox-common/Makefile b/x11/matchbox/matchbox-common/Makefile index 559bbaa8a9c..f79af795a08 100644 --- a/x11/matchbox/matchbox-common/Makefile +++ b/x11/matchbox/matchbox-common/Makefile @@ -1,21 +1,15 @@ -# $OpenBSD: Makefile,v 1.4 2007/09/15 20:04:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.5 2008/04/23 22:18:27 jasper Exp $ COMMENT= matchbox shared icons and configuration data DISTNAME= matchbox-common-0.9.1 -PKGNAME= ${DISTNAME}p0 -CATEGORIES= x11/matchbox -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-common/0.9/ +PKGNAME= ${DISTNAME}p1 -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=matchbox-common/0.9/} BUILD_DEPENDS= ::x11/matchbox/libmatchbox +USE_X11= No + CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--enable-pda-folders diff --git a/x11/matchbox/matchbox-desktop/Makefile b/x11/matchbox/matchbox-desktop/Makefile index 34664220489..f6249c55226 100644 --- a/x11/matchbox/matchbox-desktop/Makefile +++ b/x11/matchbox/matchbox-desktop/Makefile @@ -1,21 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2007/12/15 21:44:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2008/04/23 22:18:27 jasper Exp $ COMMENT= pda style application launcher or item browser DISTNAME= matchbox-desktop-0.9.1 -PKGNAME= ${DISTNAME}p2 -CATEGORIES= x11 -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/ +PKGNAME= ${DISTNAME}p3 -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=matchbox-desktop/0.9/} USE_LIBTOOL= Yes -USE_X11= Yes LIB_DEPENDS= mb.>=1::x11/matchbox/libmatchbox RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ diff --git a/x11/matchbox/matchbox-desktop/patches/patch-modules_dotdesktop_c b/x11/matchbox/matchbox-desktop/patches/patch-modules_dotdesktop_c index 3e11e5d58a4..4c51cdc2505 100644 --- a/x11/matchbox/matchbox-desktop/patches/patch-modules_dotdesktop_c +++ b/x11/matchbox/matchbox-desktop/patches/patch-modules_dotdesktop_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_dotdesktop_c,v 1.1 2006/07/20 22:37:47 robert Exp $ ---- modules/dotdesktop.c.orig Thu Jul 20 23:55:22 2006 -+++ modules/dotdesktop.c Thu Jul 20 23:56:42 2006 -@@ -280,9 +280,8 @@ +$OpenBSD: patch-modules_dotdesktop_c,v 1.2 2008/04/23 22:18:27 jasper Exp $ +--- modules/dotdesktop.c.orig Wed Dec 1 12:22:33 2004 ++++ modules/dotdesktop.c Thu Apr 24 00:02:20 2008 +@@ -280,9 +280,8 @@ dotdesktop_init (MBDesktop *mb, else { snprintf(app_paths[0], 256, "%s/applications", DATADIR); diff --git a/x11/matchbox/matchbox-keyboard/Makefile b/x11/matchbox/matchbox-keyboard/Makefile index 31347536139..036255bb963 100644 --- a/x11/matchbox/matchbox-keyboard/Makefile +++ b/x11/matchbox/matchbox-keyboard/Makefile @@ -1,20 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2008/01/06 17:13:04 naddy Exp $ +# $OpenBSD: Makefile,v 1.8 2008/04/23 22:18:27 jasper Exp $ COMMENT= on-screen virtual keyboard DISTNAME= matchbox-keyboard-0.1 -PKGNAME= ${DISTNAME}p1 -CATEGORIES= x11 -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-keyboard/0.1/ +PKGNAME= ${DISTNAME}p2 -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - -USE_X11= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=matchbox-keyboard/0.1/} LIB_DEPENDS= fakekey::x11/matchbox/libfakekey RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ diff --git a/x11/matchbox/matchbox-keyboard/patches/patch-Makefile_in b/x11/matchbox/matchbox-keyboard/patches/patch-Makefile_in index ecf0aa36221..8c4e1d9941f 100644 --- a/x11/matchbox/matchbox-keyboard/patches/patch-Makefile_in +++ b/x11/matchbox/matchbox-keyboard/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/07/20 21:14:21 robert Exp $ +$OpenBSD: patch-Makefile_in,v 1.2 2008/04/23 22:18:27 jasper Exp $ --- Makefile.in.orig Tue Feb 28 19:48:45 2006 -+++ Makefile.in Thu Jul 20 18:52:28 2006 -@@ -178,7 +178,7 @@ ++++ Makefile.in Thu Apr 24 00:02:20 2008 +@@ -178,7 +178,7 @@ SUBDIRS = src layouts $(am__append_1) EXTRA_DIST = matchbox-keyboard.desktop matchbox-keyboard.png desktopdir = $(datadir)/applications/inputmethods desktop_DATA = matchbox-keyboard.desktop diff --git a/x11/matchbox/matchbox-panel/Makefile b/x11/matchbox/matchbox-panel/Makefile index e1827c184cc..be2dacf3b5f 100644 --- a/x11/matchbox/matchbox-panel/Makefile +++ b/x11/matchbox/matchbox-panel/Makefile @@ -1,21 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2007/12/15 21:44:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2008/04/23 22:18:27 jasper Exp $ # XXX hardcoded apm list COMMENT= window bar for holding application launchers DISTNAME= matchbox-panel-0.9.3 -PKGNAME= ${DISTNAME}p0 -CATEGORIES= x11 -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/ +PKGNAME= ${DISTNAME}p1 -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - -USE_X11= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=matchbox-panel/0.9/} LIB_DEPENDS= mb.>=1::x11/matchbox/libmatchbox RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ diff --git a/x11/matchbox/matchbox-panel/patches/patch-applets_Makefile_in b/x11/matchbox/matchbox-panel/patches/patch-applets_Makefile_in index a98a789829a..2ad5e3900c9 100644 --- a/x11/matchbox/matchbox-panel/patches/patch-applets_Makefile_in +++ b/x11/matchbox/matchbox-panel/patches/patch-applets_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-applets_Makefile_in,v 1.2 2006/07/20 21:00:11 robert Exp $ +$OpenBSD: patch-applets_Makefile_in,v 1.3 2008/04/23 22:18:27 jasper Exp $ --- applets/Makefile.in.orig Tue Mar 7 19:46:57 2006 -+++ applets/Makefile.in Thu Jul 20 17:50:40 2006 -@@ -239,7 +239,7 @@ ++++ applets/Makefile.in Thu Apr 24 00:02:20 2008 +@@ -239,7 +239,7 @@ INCLUDES = -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(P @WANT_ACPI_TRUE@mb_applet_battery_SOURCES = mb-applet-battery.c @WANT_APM_TRUE@mb_applet_battery_SOURCES = mb-applet-battery.c @WANT_ACPI_TRUE@mb_applet_battery_LDADD = $(LIBMB_LIBS) $(SN_LIBS) diff --git a/x11/matchbox/matchbox-panel/patches/patch-configure b/x11/matchbox/matchbox-panel/patches/patch-configure index 737426dcaa6..fb85488b4dd 100644 --- a/x11/matchbox/matchbox-panel/patches/patch-configure +++ b/x11/matchbox/matchbox-panel/patches/patch-configure @@ -1,8 +1,8 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2005/06/17 02:57:30 jolan Exp $ ---- configure.orig Mon Apr 11 04:18:51 2005 -+++ configure Mon Jun 6 22:42:33 2005 -@@ -6446,7 +6446,7 @@ _ACEOF - fi +$OpenBSD: patch-configure,v 1.2 2008/04/23 22:18:27 jasper Exp $ +--- configure.orig Tue Mar 7 19:46:56 2006 ++++ configure Thu Apr 24 00:02:20 2008 +@@ -6519,7 +6519,7 @@ _ACEOF + fi -for ac_header in apmvar.h diff --git a/x11/matchbox/matchbox-panel/patches/patch-install-sh b/x11/matchbox/matchbox-panel/patches/patch-install-sh index 94a9ce6155d..aa13464f37e 100644 --- a/x11/matchbox/matchbox-panel/patches/patch-install-sh +++ b/x11/matchbox/matchbox-panel/patches/patch-install-sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-install-sh,v 1.2 2006/07/20 21:00:11 robert Exp $ +$OpenBSD: patch-install-sh,v 1.3 2008/04/23 22:18:27 jasper Exp $ --- install-sh.orig Wed Nov 2 01:30:12 2005 -+++ install-sh Thu Jul 20 17:51:44 2006 -@@ -213,7 +213,7 @@ ++++ install-sh Thu Apr 24 00:02:20 2008 +@@ -213,7 +213,7 @@ do fi # This sed command emulates the dirname command. diff --git a/x11/matchbox/matchbox-window-manager/Makefile b/x11/matchbox/matchbox-window-manager/Makefile index d611a70ca61..b4e9a9f92e0 100644 --- a/x11/matchbox/matchbox-window-manager/Makefile +++ b/x11/matchbox/matchbox-window-manager/Makefile @@ -1,20 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2007/12/15 21:44:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2008/04/23 22:18:27 jasper Exp $ COMMENT= window manager with a classic pda management policy DISTNAME= matchbox-window-manager-1.0 -PKGNAME= ${DISTNAME}p0 -CATEGORIES= x11 -MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/ +PKGNAME= ${DISTNAME}p1 -HOMEPAGE= http://projects.o-hand.com/matchbox/ - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - -USE_X11= Yes +MASTER_SITES= ${MASTER_SITES_MATCHBOX:=matchbox-window-manager/1.0/} LIB_DEPENDS= mb.>=1::x11/matchbox/libmatchbox RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ diff --git a/x11/matchbox/matchbox-window-manager/patches/patch-data_Makefile_in b/x11/matchbox/matchbox-window-manager/patches/patch-data_Makefile_in index 47c1b26f6f0..842301f259d 100644 --- a/x11/matchbox/matchbox-window-manager/patches/patch-data_Makefile_in +++ b/x11/matchbox/matchbox-window-manager/patches/patch-data_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-data_Makefile_in,v 1.2 2006/07/20 21:00:35 robert Exp $ +$OpenBSD: patch-data_Makefile_in,v 1.3 2008/04/23 22:18:27 jasper Exp $ --- data/Makefile.in.orig Tue Mar 7 19:41:45 2006 -+++ data/Makefile.in Thu Jul 20 17:56:29 2006 -@@ -57,7 +57,7 @@ ++++ data/Makefile.in Thu Apr 24 00:02:20 2008 +@@ -57,7 +57,7 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; @@ -10,7 +10,7 @@ $OpenBSD: patch-data_Makefile_in,v 1.2 2006/07/20 21:00:35 robert Exp $ confDATA_INSTALL = $(INSTALL_DATA) defaultsDATA_INSTALL = $(INSTALL_DATA) DATA = $(conf_DATA) $(defaults_DATA) -@@ -171,6 +171,7 @@ +@@ -171,6 +171,7 @@ target_alias = @target_alias@ @ENABLE_SCHEMAS_FALSE@SUBDIRS = themes @ENABLE_SCHEMAS_TRUE@SUBDIRS = themes schemas confdir = $(sysconfdir)/matchbox @@ -18,7 +18,7 @@ $OpenBSD: patch-data_Makefile_in,v 1.2 2006/07/20 21:00:35 robert Exp $ conf_DATA = kbdconfig defaultsdir = $(datadir)/matchbox @WANT_STANDALONE_FALSE@defaults_DATA = mbnoapp.xpm -@@ -211,20 +212,20 @@ +@@ -211,20 +212,20 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4 uninstall-info-am: install-confDATA: $(conf_DATA) @$(NORMAL_INSTALL) @@ -44,7 +44,7 @@ $OpenBSD: patch-data_Makefile_in,v 1.2 2006/07/20 21:00:35 robert Exp $ done install-defaultsDATA: $(defaults_DATA) @$(NORMAL_INSTALL) -@@ -423,7 +424,7 @@ +@@ -423,7 +424,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: