From c9f622a8e5b35e32f0553cd02e4414718feb352c Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 21 Mar 2010 09:27:25 +0000 Subject: [PATCH] - update aewm to 1.3.12 --- x11/aewm/Makefile | 22 +++++----- x11/aewm/distinfo | 10 ++--- x11/aewm/patches/patch-Makefile | 56 +++++++++++++++++++++++++ x11/aewm/patches/patch-clients_Makefile | 50 ---------------------- x11/aewm/patches/patch-src_Makefile | 43 ------------------- x11/aewm/pkg/PLIST | 26 +++++------- 6 files changed, 83 insertions(+), 124 deletions(-) create mode 100644 x11/aewm/patches/patch-Makefile delete mode 100644 x11/aewm/patches/patch-clients_Makefile delete mode 100644 x11/aewm/patches/patch-src_Makefile diff --git a/x11/aewm/Makefile b/x11/aewm/Makefile index 272073b9d06..5b5934b4c04 100644 --- a/x11/aewm/Makefile +++ b/x11/aewm/Makefile @@ -1,24 +1,26 @@ -# $OpenBSD: Makefile,v 1.24 2009/08/11 08:42:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.25 2010/03/21 09:27:25 jasper Exp $ -DISTNAME= aewm-1.3.0 -PKGNAME= ${DISTNAME}p8 +COMMENT= minimalistic window manager for X11 + +DISTNAME= aewm-1.3.12 CATEGORIES= x11 +HOMEPAGE= http://www.red-bean.com/decklin/aewm/ + # X11/9wm PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender Xt atk-1.0 c cairo expat -WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png z pthread-stubs xcb +WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig +WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 +WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png +WANTLIB += pthread-stubs xcb z -COMMENT= minimalistic window manager for X11 -HOMEPAGE= http://www.red-bean.com/~decklin/aewm/ MASTER_SITES= ${HOMEPAGE} +EXTRACT_SUFX= .tar.bz2 USE_GMAKE= Yes USE_X11= Yes diff --git a/x11/aewm/distinfo b/x11/aewm/distinfo index 8d2d9b17fba..16f6a5999d4 100644 --- a/x11/aewm/distinfo +++ b/x11/aewm/distinfo @@ -1,5 +1,5 @@ -MD5 (aewm-1.3.0.tar.gz) = zNCYtE1NehFVVFiniM51fg== -RMD160 (aewm-1.3.0.tar.gz) = vqLlhltLh+Loo9sILcLttW4nFYI= -SHA1 (aewm-1.3.0.tar.gz) = WgEPMoJH/fKPC9ynRZ+AFCMp4tE= -SHA256 (aewm-1.3.0.tar.gz) = U/kQm9BDtGF3emYhoqAgWTtB9ZNV5Y86UPOxbGYZEno= -SIZE (aewm-1.3.0.tar.gz) = 48720 +MD5 (aewm-1.3.12.tar.bz2) = Gt27foAlNdxfEJ15v+oCpQ== +RMD160 (aewm-1.3.12.tar.bz2) = fA6cCKbXfmsXQYEdz5RGFAmVww8= +SHA1 (aewm-1.3.12.tar.bz2) = bb4aXG7hISA0ziSNzkGI1Fep4wU= +SHA256 (aewm-1.3.12.tar.bz2) = IO3D5XYw/i4MphOc5Xab0QoUn1mhb0Ws35vGQmj9Wd4= +SIZE (aewm-1.3.12.tar.bz2) = 36677 diff --git a/x11/aewm/patches/patch-Makefile b/x11/aewm/patches/patch-Makefile new file mode 100644 index 00000000000..13d8cdcf641 --- /dev/null +++ b/x11/aewm/patches/patch-Makefile @@ -0,0 +1,56 @@ +$OpenBSD: patch-Makefile,v 1.5 2010/03/21 09:27:25 jasper Exp $ +--- Makefile.orig Thu Dec 27 19:15:32 2007 ++++ Makefile Mon Jan 25 23:31:39 2010 +@@ -3,7 +3,7 @@ + + # Set this to the location where you want to install + DESTDIR = +-XROOT = /usr/X11R6 ++XROOT = ${X11BASE} + + # Uncomment to enable Shape extension support + #OPT_WMFLAGS += -DSHAPE +@@ -17,12 +17,12 @@ XROOT = /usr/X11R6 + #OPT_WMFLAGS += -DDEBUG + #OPT_WMLIB += -lefence + +-CC = gcc +-CFLAGS = -g -O2 -Wall ++#CC = gcc ++#CFLAGS = -g -O2 -Wall + +-BINDIR = $(DESTDIR)$(XROOT)/bin +-MANDIR = $(DESTDIR)$(XROOT)/man/man1 +-CFGDIR = $(DESTDIR)/etc/X11/aewm ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man1 ++CFGDIR = ${PREFIX}/share/examples/aewm + + PLAINOBJ = aesession.o parser.o + CLIENTOBJ = common.o atom.o +@@ -49,7 +49,7 @@ WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS) + GTKFLAGS = `pkg-config --cflags gtk+-2.0` + + $(PLAINOBJ): %.o: %.c +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(X11FLAGS) -c $< -o $@ + + $(X11OBJ): %.o: %.c + $(CC) $(CFLAGS) $(X11FLAGS) -c $< -o $@ +@@ -81,13 +81,12 @@ AERC = aewmrc clientsrc + + install: all + mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR) +- install -s $(ALLBIN) $(BINDIR) ++ ${BSD_INSTALL_PROGRAM} $(ALLBIN) $(BINDIR) + for i in $(AEMAN); do \ +- install -m 644 doc/$$i $(MANDIR); \ +- gzip -9 $(MANDIR)/$$i; \ ++ ${BSD_INSTALL_MAN} doc/$$i $(MANDIR); \ + done + for i in $(AERC); do \ +- install -m 644 doc/$$i.ex $(CFGDIR)/$$i; \ ++ ${BSD_INSTALL_PROGRAM} doc/$$i.ex $(CFGDIR)/$$i; \ + done + for i in $(PLAINBIN) $(X11BIN) $(GTKBIN); do \ + ln -sf aeclients.1x.gz $(MANDIR)/$$i.1x.gz; \ diff --git a/x11/aewm/patches/patch-clients_Makefile b/x11/aewm/patches/patch-clients_Makefile deleted file mode 100644 index a446ef53f88..00000000000 --- a/x11/aewm/patches/patch-clients_Makefile +++ /dev/null @@ -1,50 +0,0 @@ -$OpenBSD: patch-clients_Makefile,v 1.3 2005/01/10 00:30:23 jcs Exp $ ---- clients/Makefile.orig Tue Nov 9 20:30:06 2004 -+++ clients/Makefile Sun Jan 9 18:15:46 2005 -@@ -5,15 +5,15 @@ - # Uncomment to enable building with GTK+ 1.2 instead of 2.x. - #USE_OLD_GTK = 1 - --CC = gcc --CFLAGS = -g -O2 -Wall -+#CC = gcc -+#CFLAGS = -g -O2 -Wall - - AELIBDIR = ../lib - MYLIBDIR = lib --XROOT = /usr/X11R6 --BINDIR = $(DESTDIR)$(XROOT)/bin --MANDIR = $(DESTDIR)$(XROOT)/man/man1 --CFGDIR = $(DESTDIR)/etc/X11/aewm -+XROOT = ${X11BASE} -+BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/man1 -+CFGDIR = ${PREFIX}/share/examples/aewm - - INCLUDES = -I$(AELIBDIR) -I$(MYLIBDIR) - X11PATH = -I$(XROOT)/include -@@ -77,20 +77,19 @@ $(GTKOBJS): %.o: %.c - $(CC) $(CFLAGS) $(INCLUDES) $(GTKPATH) -c $< -o $@ - - $(ETCOBJS): %.o: %.c -- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ -+ $(CC) $(CFLAGS) $(INCLUDES) $(X11PATH) -c $< -o $@ - - # -------------------------------------------------------------------- - - install: all -- install -s $(ALLPROGS) $(BINDIR) -- install -m 644 $(MANPAGE) $(MANDIR) -- gzip -9vf $(MANDIR)/$(MANPAGE) -+ ${BSD_INSTALL_PROGRAM} $(ALLPROGS) $(BINDIR) -+ ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR) - mkdir -p $(CFGDIR) && cp clientsrc.sample $(CFGDIR)/clientsrc - cd $(BINDIR) && ln -sf aemenu-gtk aemenu - cd $(BINDIR) && ln -sf aepanel-gtk aepanel - cd $(MANDIR) && \ - for i in $(ALLPROGS); do \ -- ln -sf $(MANPAGE).gz $$i.1x.gz; \ -+ ln -sf $(MANPAGE) $$i.1x; \ - done \ - - clean: diff --git a/x11/aewm/patches/patch-src_Makefile b/x11/aewm/patches/patch-src_Makefile deleted file mode 100644 index 5e60ce67800..00000000000 --- a/x11/aewm/patches/patch-src_Makefile +++ /dev/null @@ -1,43 +0,0 @@ -$OpenBSD: patch-src_Makefile,v 1.1 2005/01/10 00:30:23 jcs Exp $ ---- src/Makefile.orig Wed Nov 17 14:58:58 2004 -+++ src/Makefile Sun Jan 9 18:15:46 2005 -@@ -4,7 +4,7 @@ - - # This should be set to the location of the X installation against - # which you would like to compile. --XROOT = /usr/X11R6 -+XROOT = ${X11BASE} - - # Comment out to remove shape support (for X11R5 or a smaller binary) - DEFINES += -DSHAPE -@@ -25,13 +25,13 @@ EXTRA_LIBS += -lXext - - # -------------------------------------------------------------------- - --CC = gcc --CFLAGS = -g -O2 -Wall -+#CC = gcc -+#CFLAGS = -g -O2 -Wall - - MYLIBDIR = ../lib --BINDIR = $(DESTDIR)$(XROOT)/bin --MANDIR = $(DESTDIR)$(XROOT)/man/man1 --CFGDIR = $(DESTDIR)/etc/X11/aewm -+BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/man1 -+CFGDIR = ${PREFIX}/share/examples/aewm - INCLUDES = -I$(MYLIBDIR) -I$(XROOT)/include $(EXTRA_INC) - LDPATH = -L$(XROOT)/lib - LIBS = -lX11 $(EXTRA_LIBS) -@@ -50,9 +50,8 @@ $(OBJS): %.o: %.c $(HEADERS) - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ - - install: all -- install -s $(PROG) $(BINDIR) -- install -m 644 $(MANPAGE) $(MANDIR) -- gzip -9vf $(MANDIR)/$(MANPAGE) -+ ${BSD_INSTALL_PROGRAM} $(PROG) $(BINDIR) -+ ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR) - mkdir -p $(CFGDIR) && cp aewmrc.sample $(CFGDIR)/aewmrc - - clean: diff --git a/x11/aewm/pkg/PLIST b/x11/aewm/pkg/PLIST index 9ddbb3f803b..efeede9edf4 100644 --- a/x11/aewm/pkg/PLIST +++ b/x11/aewm/pkg/PLIST @@ -1,21 +1,15 @@ -@comment $OpenBSD: PLIST,v 1.4 2005/01/10 00:30:23 jcs Exp $ -bin/aemenu -bin/aemenu-gtk -bin/aemenu-xaw -bin/aepanel -bin/aepanel-gtk -bin/aepanel-xaw -bin/aesession -bin/aewm -bin/switch-desk +@comment $OpenBSD: PLIST,v 1.5 2010/03/21 09:27:25 jasper Exp $ +@bin bin/aedesk +@bin bin/aemenu +@bin bin/aepanel +@bin bin/aesession +@bin bin/aewm @man man/man1/aeclients.1x -@man man/man1/aemenu-gtk.1x -@man man/man1/aemenu-xaw.1x -@man man/man1/aepanel-gtk.1x -@man man/man1/aepanel-xaw.1x -@man man/man1/aesession.1x +@man man/man1/aedesk.1x.gz +@man man/man1/aemenu.1x.gz +@man man/man1/aepanel.1x.gz +@man man/man1/aesession.1x.gz @man man/man1/aewm.1x -@man man/man1/switch-desk.1x share/examples/aewm/ share/examples/aewm/aewmrc share/examples/aewm/clientsrc