Update to aewm-1.2.0
This commit is contained in:
jcs
parent
2f508e0407
commit
8cf870fe14
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2001/11/02 17:52:58 jcs Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2002/02/10 03:04:18 jcs Exp $
|
||||
|
||||
DISTNAME= aewm-1.1.2
|
||||
DISTNAME= aewm-1.2.0
|
||||
CATEGORIES= x11
|
||||
NEED_VERSION= 1.474
|
||||
NEED_VERSION= 1.503
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
|
||||
3
x11/aewm/distinfo
Normal file
3
x11/aewm/distinfo
Normal file
@ -0,0 +1,3 @@
|
||||
MD5 (aewm-1.2.0.tar.gz) = 613a22ef5e4c00a4821641d0d92492b2
|
||||
RMD160 (aewm-1.2.0.tar.gz) = c6700bb613c22b60e6b2dab92c26e7fe1c0fa640
|
||||
SHA1 (aewm-1.2.0.tar.gz) = 713a0890fa52c6ff791d3c79570dfcb108367976
|
||||
@ -1,3 +0,0 @@
|
||||
MD5 (aewm-1.1.2.tar.gz) = 3eca52e76888f768b96d17dcb84b57cc
|
||||
RMD160 (aewm-1.1.2.tar.gz) = e8ccfaf44a445c7a0d1d33465cc3d097af95ad99
|
||||
SHA1 (aewm-1.1.2.tar.gz) = 841f3445d21f0021c90e21c9c4cfdeb3f708fa5e
|
||||
@ -1,13 +1,17 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1.1.1 2001/05/11 01:15:25 naddy Exp $
|
||||
--- Makefile.orig Wed Jan 10 19:51:47 2001
|
||||
+++ Makefile Fri May 11 03:09:54 2001
|
||||
@@ -19,15 +19,15 @@ EXTRA_LIBS += -lXext
|
||||
$OpenBSD: patch-Makefile,v 1.2 2002/02/10 03:04:18 jcs Exp $
|
||||
--- Makefile.orig Fri Feb 1 14:09:54 2002
|
||||
+++ Makefile Sat Feb 9 20:51:52 2002
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
# This should be set to the location of the X installation you want to
|
||||
# compile against.
|
||||
-XROOT = /usr/X11R6
|
||||
+XROOT = ${X11BASE}
|
||||
|
||||
# Comment out to remove shape support (for X11R5 or just a tiny bin)
|
||||
DEFINES += -DSHAPE
|
||||
@@ -27,12 +27,12 @@
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
|
||||
-CC = gcc
|
||||
@ -17,20 +21,23 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2001/05/11 01:15:25 naddy Exp $
|
||||
|
||||
-BINDIR = $(DESTDIR)$(XROOT)/bin
|
||||
-MANDIR = $(DESTDIR)$(XROOT)/man/man1
|
||||
-CFGDIR = $(DESTDIR)/etc/X11/aewm
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
+MANDIR = ${PREFIX}/man/man1
|
||||
INCLUDES = -I$(XROOT)/include
|
||||
+CFGDIR = ${PREFIX}/share/examples/aewm
|
||||
INCLUDES = -Ilib -I$(XROOT)/include
|
||||
LDPATH = -L$(XROOT)/lib
|
||||
LIBS = -lX11 $(EXTRA_LIBS)
|
||||
@@ -38,6 +38,7 @@ OBJS = main.o events.o client.o new.
|
||||
HEADERS = aewm.h
|
||||
@@ -45,7 +45,7 @@
|
||||
all: $(PROG) subdirs
|
||||
|
||||
all: $(PROG)
|
||||
+ cd goodies; ${MAKE}
|
||||
subdirs:
|
||||
- +make -C clients all
|
||||
+ +gmake -C clients all
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
|
||||
@@ -46,9 +47,9 @@ $(OBJS): %.o: %.c $(HEADERS)
|
||||
@@ -54,16 +54,15 @@
|
||||
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
|
||||
|
||||
install: all
|
||||
@ -39,7 +46,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2001/05/11 01:15:25 naddy Exp $
|
||||
- gzip -9vf $(MANDIR)/$(MANPAGE)
|
||||
+ ${BSD_INSTALL_PROGRAM} $(PROG) $(BINDIR)
|
||||
+ ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR)
|
||||
+ cd goodies; ${MAKE} install
|
||||
mkdir -p $(CFGDIR) && cp aewmrc.sample $(CFGDIR)/aewmrc
|
||||
- +make -C clients install
|
||||
+ +gmake -C clients install
|
||||
|
||||
clean:
|
||||
clean: subdirs-clean
|
||||
rm -f $(PROG) $(OBJS)
|
||||
|
||||
subdirs-clean:
|
||||
- +make -C clients clean
|
||||
+ +gmake -C clients clean
|
||||
|
||||
.PHONY: all subdirs install clean subdirs-clean
|
||||
|
||||
45
x11/aewm/patches/patch-clients_Makefile
Normal file
45
x11/aewm/patches/patch-clients_Makefile
Normal file
@ -0,0 +1,45 @@
|
||||
$OpenBSD: patch-clients_Makefile,v 1.1 2002/02/10 03:04:18 jcs Exp $
|
||||
--- clients/Makefile.orig Sun Jan 27 17:13:20 2002
|
||||
+++ clients/Makefile Sat Feb 9 20:51:10 2002
|
||||
@@ -2,15 +2,15 @@
|
||||
# Copyright 1998-2001 Decklin Foster <decklin@red-bean.com>
|
||||
# This program is free software; see LICENSE for details.
|
||||
|
||||
-CC = gcc
|
||||
-CFLAGS = -g -O2 -Wall
|
||||
+#CC = gcc
|
||||
+#CFLAGS = -g -O2 -Wall
|
||||
|
||||
-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../lib -Ilib
|
||||
+INCLUDES = -I../lib -Ili -Ilib
|
||||
X11PATH = -I$(XROOT)/include
|
||||
X11LIBS = -L$(XROOT)/lib -lX11
|
||||
XAWLIBS = -L$(XROOT)/lib -lX11 -lXt -lXaw
|
||||
@@ -72,15 +72,14 @@
|
||||
# --------------------------------------------------------------------
|
||||
|
||||
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:
|
||||
@ -1,37 +0,0 @@
|
||||
$OpenBSD: patch-goodies-Makefile,v 1.1.1.1 2001/05/11 01:15:25 naddy Exp $
|
||||
--- goodies/Makefile.orig Wed Jan 10 19:31:15 2001
|
||||
+++ goodies/Makefile Fri May 11 03:10:22 2001
|
||||
@@ -2,12 +2,12 @@
|
||||
# Copyright (c) 1998-2001 Decklin Foster <decklin@red-bean.com>
|
||||
# Free software! Please see README for details and license. ---
|
||||
|
||||
-CC = gcc
|
||||
-CFLAGS = -g -O2 -Wall $(DEFINES)
|
||||
+#CC = gcc
|
||||
+CFLAGS += $(DEFINES)
|
||||
|
||||
-XROOT = /usr/X11R6
|
||||
-BINDIR = $(DESTDIR)$(XROOT)/bin
|
||||
-MANDIR = $(DESTDIR)$(XROOT)/man/man1
|
||||
+XROOT = ${X11BASE}
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
+MANDIR = ${PREFIX}/man/man1
|
||||
|
||||
X11PATH = -I$(XROOT)/include
|
||||
X11LIBS = -L$(XROOT)/lib -lX11
|
||||
@@ -68,12 +68,11 @@ $(ETCOBJS): %.o: %.c
|
||||
# --------------------------------------------------------------------
|
||||
|
||||
install: all
|
||||
- install -s $(XAWPROGS) $(GTKPROGS) $(ETCPROGS) $(BINDIR)
|
||||
- install -m 644 $(MANPAGE) $(MANDIR)
|
||||
- gzip -9vf $(MANDIR)/$(MANPAGE)
|
||||
+ ${BSD_INSTALL_PROGRAM} $(XAWPROGS) $(GTKPROGS) $(ETCPROGS) $(BINDIR)
|
||||
+ ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR)
|
||||
cd $(MANDIR) && \
|
||||
for i in $(XAWPROGS) $(GTKPROGS) $(ETCPROGS); do \
|
||||
- ln -sf $(MANPAGE).gz $$i.1x.gz; \
|
||||
+ ln -sf $(MANPAGE) $$i.1x; \
|
||||
done \
|
||||
|
||||
clean:
|
||||
@ -1,24 +1,21 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/05/11 01:15:25 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2002/02/10 03:04:18 jcs Exp $
|
||||
bin/aemenu
|
||||
bin/aemenu-gtk
|
||||
bin/aemenu-xaw
|
||||
bin/aepanel
|
||||
bin/aepanel-gtk
|
||||
bin/aepanel-xaw
|
||||
bin/aesession
|
||||
bin/aewm
|
||||
bin/gtk-palette
|
||||
bin/gtk-panel
|
||||
bin/gtk-panel-menu
|
||||
bin/gtk-panel-menu2
|
||||
bin/gtk-switch
|
||||
bin/gtk-switch-menu
|
||||
bin/xaw-palette
|
||||
bin/xaw-panel
|
||||
bin/xaw-switch
|
||||
bin/xsession
|
||||
man/man1/aewm-goodies.1x
|
||||
bin/set-gnome-pda
|
||||
man/man1/aeclients.1x
|
||||
man/man1/aemenu-gtk.1x
|
||||
man/man1/aemenu-xaw.1x
|
||||
man/man1/aepanel-gtk.1x
|
||||
man/man1/aepanel-xaw.1x
|
||||
man/man1/aesession.1x
|
||||
man/man1/aewm.1x
|
||||
man/man1/gtk-palette.1x
|
||||
man/man1/gtk-panel-menu.1x
|
||||
man/man1/gtk-panel-menu2.1x
|
||||
man/man1/gtk-panel.1x
|
||||
man/man1/gtk-switch-menu.1x
|
||||
man/man1/gtk-switch.1x
|
||||
man/man1/xaw-palette.1x
|
||||
man/man1/xaw-panel.1x
|
||||
man/man1/xaw-switch.1x
|
||||
man/man1/xsession.1x
|
||||
man/man1/set-gnome-pda.1x
|
||||
share/examples/aewm/aewmrc
|
||||
share/examples/aewm/clientsrc
|
||||
@dirrm share/examples/aewm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user