[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Update: pwm

To: ports@openbsd.org
Subject: Update: pwm
From: Jon Olsson <jon@joshua.haninge.kth.se>
Date: Sun, 1 Jun 2003 22:20:49 +0200
Content-Disposition: inline
User-Agent: Mutt/1.4.1i

Hi,

 Here's the diffs for the latest pwm, released a couple of days ago.

Cheers,
Jon

diff -ruN pwm/CVS/Root pwm-new/CVS/Root
--- pwm/CVS/Root	Sun Jun  1 21:22:50 2003
+++ pwm-new/CVS/Root	Sun Apr 27 12:02:13 2003
@@ -1 +1 @@
-anoncvs@anoncvs.ca.openbsd.org:/cvs
+/cvs
diff -ruN pwm/Makefile pwm-new/Makefile
--- pwm/Makefile	Sun Dec 29 21:31:41 2002
+++ pwm-new/Makefile	Sun Jun  1 20:36:57 2003
@@ -2,7 +2,7 @@
 
 COMMENT=		"lightweight window manager with emphasis on usability"
 
-DISTNAME=		pwm-20010309
+DISTNAME=		pwm-20030528
 CATEGORIES=		x11
 
 HOMEPAGE=		http://modeemi.cs.tut.fi/~tuomov/pwm/
@@ -17,6 +17,7 @@
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
+USE_GMAKE=		Yes
 NO_REGRESS=		Yes
 
 MAKE_ENV=		CC='${CC}' SYSCONFDIR='${SYSCONFDIR}'
diff -ruN pwm/distinfo pwm-new/distinfo
--- pwm/distinfo	Wed Feb 20 13:47:55 2002
+++ pwm-new/distinfo	Sun Jun  1 20:35:40 2003
@@ -1,3 +1,3 @@
-MD5 (pwm-20010309.tar.gz) = 2d5e5c33020c97edd85c4e0b47930e00
-RMD160 (pwm-20010309.tar.gz) = e083a60b6bd2a6e40715ec75a277f5e9b0a7b1df
-SHA1 (pwm-20010309.tar.gz) = 2c66b778095793cb4ddbf4cbc721edac67250ae9
+MD5 (pwm-20030528.tar.gz) = fce8d3609f88507979a02d5fedabc770
+RMD160 (pwm-20030528.tar.gz) = 50c6f89009a81b5df1ac1358b1a496e00e8356a4
+SHA1 (pwm-20030528.tar.gz) = 36445864c5a2e19c35d7eb49ca5572651f4588d2
diff -ruN pwm/patches/CVS/Root pwm-new/patches/CVS/Root
--- pwm/patches/CVS/Root	Sun Jun  1 21:22:50 2003
+++ pwm-new/patches/CVS/Root	Sun Apr 27 12:02:13 2003
@@ -1 +1 @@
-anoncvs@anoncvs.ca.openbsd.org:/cvs
+/cvs
diff -ruN pwm/patches/patch-Makefile pwm-new/patches/patch-Makefile
--- pwm/patches/patch-Makefile	Wed Feb 20 13:47:55 2002
+++ pwm-new/patches/patch-Makefile	Sun Jun  1 21:11:45 2003
@@ -1,98 +1,26 @@
-$OpenBSD: patch-Makefile,v 1.2 2002/02/20 12:47:55 naddy Exp $
---- Makefile.orig	Fri Mar  9 09:20:04 2001
-+++ Makefile	Mon Feb 18 21:54:35 2002
-@@ -1,69 +1,34 @@
--##
--## PWM Makefile
--##
--
--# System-specific configuration is in system.mk
--include system.mk
--
--######################################
--
--SUBDIRS=libtu
--LIBS += -L./libtu -ltu -lm $(X11_LIBS) -lX11
--INCLUDES += -I./libtu/include $(X11_INCLUDES)
--DEFINES += -DETCDIR=\"$(ETCDIR)\"
--CFLAGS += $(XOPEN_SOURCE)
--TO_REALCLEAN += pwm.1x
--
- OBJS=	main.o draw.o font.o frame.o event.o clientwin.o thing.o \
- 	property.o pointer.o key.o moveres.o cursor.o function.o \
- 	exec.o focus.o workspace.o winobj.o screen.o menu.o \
- 	readconfig.o menudata.o dock.o frameid.o placement.o \
- 	binding.o winlist.o mwmhints.o signal.o winprops.o
+$OpenBSD$
+--- Makefile.orig	Sun Jun  1 21:07:48 2003
++++ Makefile	Sun Jun  1 21:11:32 2003
+@@ -47,17 +47,13 @@ _install:
+ 	$(INSTALL) -m $(DATA_MODE) config.txt $(DOCDIR)/pwm
+ 	$(INSTALL) -m $(DATA_MODE) LICENSE $(DOCDIR)/pwm
  
--TARGETS=pwm
--
--######################################
--
--include rules.mk
--
--######################################
--
--pwm: $(OBJS) pwm.1x
--	$(CC) $(OBJS) $(LDFLAGS) -o $@
--
--pwm.1x: pwm.1x.in
--	sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x
--
--_install:
--	$(INSTALLDIR) $(BINDIR)
--	$(INSTALL) -m $(BIN_MODE) pwm $(BINDIR)
--	$(STRIP) $(BINDIR)/pwm
--
--	$(INSTALLDIR) $(MANDIR)/man1
--	$(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR)/man1
--
--	$(INSTALLDIR) $(DOCDIR)
--	$(INSTALLDIR) $(DOCDIR)/pwm
--	$(INSTALL) -m $(DATA_MODE) config.txt $(DOCDIR)/pwm
--	$(INSTALL) -m $(DATA_MODE) LICENSE $(DOCDIR)/pwm
--
 -	$(INSTALLDIR) $(ETCDIR)
 -	$(INSTALLDIR) $(ETCDIR)/pwm
--	for i in etc/pwm/*.conf; do \
++	$(INSTALLDIR) $(SAMPLEDIR)
++	$(INSTALLDIR) $(SAMPLEDIR)/pwm
+ 	for i in etc/pwm/*.conf; do \
 -		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/pwm; \
--	done
++		$(INSTALL) -m $(DATA_MODE) $$i $(SAMPLEDIR)/pwm; \
+ 	done
 -	@ if test -f $(ETCDIR)/pwm/pwm.conf ; then \
 -		echo "$(ETCDIR)/pwm/pwm.conf already exists. Not installing one."; \
 -	else \
 -		echo "Installing sample configuration file $(ETCDIR)/pwm/pwm.conf"; \
 -		$(INSTALL) -m $(DATA_MODE) etc/pwm/sample.conf $(ETCDIR)/pwm/pwm.conf; \
 -	fi
--
-+CFLAGS	+= -DPREFIX=\"${PREFIX}\" -DETCDIR=\"${SYSCONFDIR}\" -Ilibtu/include -I${X11BASE}/include
++	echo "Installing sample configuration file $(ETCDIR)/pwm/pwm.conf";
++	$(INSTALL) -m $(DATA_MODE) etc/pwm/sample.conf $(SAMPLEDIR)/pwm/pwm.conf-sample;
  
--# Disclaimer: I don't have either Gnome or KDE.
-+LDFLAGS	+= ${WARN} -Llibtu -ltu -lm -lX11 -L${X11BASE}/lib
  
--install-gnomede: support/PWM.desktop
--	$(INSTALL) -m $(DATA_MODE) support/PWM.desktop \
--	`gnome-config --datadir`/gnome/wm-properties
-+all: main
- 
--install-gnome: install install-gnomede
-+main:   ${OBJS}
-+	${CC} ${OBJS} ${LDFLAGS} -o pwm
-+	sed -e 's#/usr/local/etc#${SYSCONFDIR}#g' -e 's#PREFIX#${PREFIX}/share#g' pwm.1x.in > pwm.1x
-+
-+$(OBJS): libtu
-+
-+libtu::
-+	(cd ${.CURDIR}/libtu && ${MAKE})
-+
-+install:
-+	${BSD_INSTALL_PROGRAM} pwm ${PREFIX}/bin
-+	${BSD_INSTALL_MAN} pwm.1x ${PREFIX}/man/man1/pwm.1
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/pwm
-+	${BSD_INSTALL_DATA} LICENSE ${PREFIX}/share/doc/pwm
-+	${BSD_INSTALL_DATA} config.txt ${PREFIX}/share/doc/pwm
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/pwm
-+	${BSD_INSTALL_DATA} etc/pwm/buttons-default.conf ${PREFIX}/share/examples/pwm/buttons-default.conf-sample
-+	${BSD_INSTALL_DATA} etc/pwm/look-beoslike.conf ${PREFIX}/share/examples/pwm/look-beoslike.conf-sample
-+	${BSD_INSTALL_DATA} etc/pwm/menus-default.conf ${PREFIX}/share/examples/pwm/menus-default.conf-sample
-+	${BSD_INSTALL_DATA} etc/pwm/keys-default.conf ${PREFIX}/share/examples/pwm/keys-default.conf-sample
-+	${BSD_INSTALL_DATA} etc/pwm/look-brownsteel.conf ${PREFIX}/share/examples/pwm/look-brownsteel.conf-sample
-+	${BSD_INSTALL_DATA} etc/pwm/sample.conf ${PREFIX}/share/examples/pwm/pwm.conf-sample
+ # Disclaimer: I don't have either Gnome or KDE.
diff -ruN pwm/patches/patch-libtu_Makefile pwm-new/patches/patch-libtu_Makefile
--- pwm/patches/patch-libtu_Makefile	Wed Feb 20 13:47:55 2002
+++ pwm-new/patches/patch-libtu_Makefile	Thu Jan  1 01:00:00 1970
@@ -1,64 +0,0 @@
-$OpenBSD: patch-libtu_Makefile,v 1.1 2002/02/20 12:47:55 naddy Exp $
---- libtu/Makefile.orig	Fri Mar  9 09:20:04 2001
-+++ libtu/Makefile	Mon Feb 18 20:15:03 2002
-@@ -1,56 +1,4 @@
--LIBTU_NO_ERRMSG=1
--##
--## libtu Makefile
--##
--
--# System-specific configuration is in ../system.mk
--include ../system.mk
--
--######################################
--
--INCLUDES += -I./include
--CFLAGS += $(POSIX_SOURCE)
--
--OBJS= misc.o output.o util.o optparser.o parser.o tokenizer.o
--
--ifdef LIBTU_NO_ERRMSG
--DEFINES += -DLIBTU_NO_ERRMSG
--else
--ifndef HAS_SYSTEM_ASPRINTF
--OBJS += ../snprintf_2.2/snprintf.o
--else
--DEFINES += -DHAS_SYSTEM_ASPRINTF
--endif
--endif
--
--TARGETS=libtu.a
--TESTERS=tester tester2 tester3
--
--######################################
--
--include ../rules.mk
--
--######################################
--
--testers: $(TESTERS)
--
--libtu.a: $(OBJS)
--	$(AR) $(ARFLAGS) $@ $+
--	$(RANLIB) $@
--	
--tester: tester.c libtu.a
--	$(CC) $(CFLAGS) $< -L. -ltu -lm -o $@
--
--tester2: tester2.c libtu.a
--	$(CC) $(CFLAGS) $< -L. -ltu -lm -o $@
--
--tester3: tester3.c libtu.a
--	$(CC) $(CFLAGS) $< -L. -ltu -lm -o $@
--
--_install:
--	$(INSTALLDIR) $(LIBDIR)
--	$(INSTALLDIR) $(INCDIR)/libtu
--	$(INSTALL) -m $(DATA_MODE) libtu.a $(LIBDIR)
--	for i in include/libtu/*.h; do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(INCDIR)/libtu; \
--	done
-+CFLAGS	+= -Iinclude -DLIBTU_NO_ERRMSG
-+OBJS	= misc.o output.o util.o optparser.o parser.o tokenizer.o
-+all:	${OBJS}
-+	${AR} ${ARFLAGS} libtu.a ${OBJS}
diff -ruN pwm/patches/patch-system_mk pwm-new/patches/patch-system_mk
--- pwm/patches/patch-system_mk	Thu Jan  1 01:00:00 1970
+++ pwm-new/patches/patch-system_mk	Sun Jun  1 21:11:52 2003
@@ -0,0 +1,46 @@
+$OpenBSD$
+--- system.mk.orig	Thu Dec 28 15:08:05 2000
++++ system.mk	Sun Jun  1 21:08:25 2003
+@@ -7,13 +7,12 @@
+ ## Installation paths
+ ##
+ 
+-PREFIX=/usr/local
+-
+ # No need to modify these usually
+ BINDIR=$(PREFIX)/bin
+ ETCDIR=$(PREFIX)/etc
+ MANDIR=$(PREFIX)/man
+-DOCDIR=$(PREFIX)/doc
++DOCDIR=$(PREFIX)/share/doc
++SAMPLEDIR=$(PREFIX)/share/examples
+ # Not used
+ INCDIR=$(PREFIX)/include
+ LIBDIR=$(PREFIX)/lib
+@@ -23,7 +22,7 @@ LIBDIR=$(PREFIX)/lib
+ ## X libraries, includes and options
+ ##
+ 
+-X11_PREFIX=/usr/X11R6
++X11_PREFIX=${X11BASE}
+ 
+ # SunOS/Solaris
+ #X11_PREFIX=/usr/openwin
+@@ -40,7 +39,7 @@ X11_DEFINES=
+ ## C compiler
+ ##
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
+ # they're mainly for development use. So, if they cause trouble (not
+@@ -54,6 +53,8 @@ POSIX_SOURCE=-ansi -D_POSIX_SOURCE
+ # and . (ion) XOPEN_SOURCE.
+ # There is variation among systems what should be used and how they interpret
+ # it so it is perhaps better not using anything at all.
++
++HAS_SYSTEM_ASPRINTF=YES
+ 
+ # Most systems
+ #XOPEN_SOURCE=-ansi -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
diff -ruN pwm/pkg/CVS/Root pwm-new/pkg/CVS/Root
--- pwm/pkg/CVS/Root	Sun Jun  1 21:22:50 2003
+++ pwm-new/pkg/CVS/Root	Sun Apr 27 12:02:13 2003
@@ -1 +1 @@
-anoncvs@anoncvs.ca.openbsd.org:/cvs
+/cvs
diff -ruN pwm/pkg/PLIST pwm-new/pkg/PLIST
--- pwm/pkg/PLIST	Wed Feb 20 13:47:55 2002
+++ pwm-new/pkg/PLIST	Sun Jun  1 21:13:18 2003
@@ -1,13 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/02/20 12:47:55 naddy Exp $
+@comment $OpenBSD$
 bin/pwm
-man/man1/pwm.1
+man/man1/pwm.1x
 share/doc/pwm/LICENSE
 share/doc/pwm/config.txt
-share/examples/pwm/buttons-default.conf-sample
-share/examples/pwm/keys-default.conf-sample
-share/examples/pwm/look-beoslike.conf-sample
-share/examples/pwm/look-brownsteel.conf-sample
-share/examples/pwm/menus-default.conf-sample
+share/examples/pwm/buttons-default.conf
+share/examples/pwm/keys-default.conf
+share/examples/pwm/look-beoslike.conf
+share/examples/pwm/look-brownsteel.conf
+share/examples/pwm/menus-default.conf
 share/examples/pwm/pwm.conf-sample
+share/examples/pwm/sample.conf
 @dirrm share/examples/pwm
 @dirrm share/doc/pwm

Follow-Ups:
- Re: Update: pwm
  - From: Greg Steuck <greg-openbsd-ports@nest.cx>

Prev by Date: Re: mozilla-firebird-0.6 open/save file dialog
Next by Date: Re: mozilla-firebird-0.6 open/save file dialog
Prev by thread: Re: mozilla-firebird-0.6 open/save file dialog
Next by thread: Re: Update: pwm
Index(es):
- Date
- Thread