From 8ebae0487c1a71bba554ba61f1a38d7d4bed197a Mon Sep 17 00:00:00 2001
From: sobomax <sobomax@FreeBSD.org>
Date: Mon, 28 May 2001 11:08:23 +0000
Subject: Update to 1.11.1.

---
 x11-wm/oroborus/Makefile             | 15 ++-------------
 x11-wm/oroborus/distinfo             |  2 +-
 x11-wm/oroborus/files/patch-Makefile | 30 +++++++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 19 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index aa34da61c92e..47c316fcb882 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	oroborus
-PORTVERSION=	1.10
+PORTVERSION=	1.11.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/
 DISTNAME=	${PORTNAME}-src-v${PORTVERSION}
@@ -18,17 +18,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XPM=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-
-do-install:
-	${MKDIR} ${PREFIX}/share/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${WRKSRC}/install_rc ${PREFIX}/share/${PORTNAME}/pixmaps/default > \
-		${WRKDIR}/${PORTNAME}rc
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}rc ${PREFIX}/share/${PORTNAME}
-.for dir in agua default defold mac next win95
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/pixmaps/${dir}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/${dir}/[^.]* \
-		${PREFIX}/share/${PORTNAME}/pixmaps/${dir}
-.endfor
+MAKE_ENV=	MKDIR="${MKDIR}"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/oroborus/distinfo b/x11-wm/oroborus/distinfo
index b5d3ac12a45f..611641eb8128 100644
--- a/x11-wm/oroborus/distinfo
+++ b/x11-wm/oroborus/distinfo
@@ -1 +1 @@
-MD5 (oroborus-src-v1.10.tar.gz) = cecb857ee9ce9c7b3c2030da26451231
+MD5 (oroborus-src-v1.11.1.tar.gz) = 17390c6d3fca9acbdeb0496f3bc511fb
diff --git a/x11-wm/oroborus/files/patch-Makefile b/x11-wm/oroborus/files/patch-Makefile
index 484963c3ab6a..8480e1a39748 100644
--- a/x11-wm/oroborus/files/patch-Makefile
+++ b/x11-wm/oroborus/files/patch-Makefile
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- Makefile.orig	Mon May 21 00:33:34 2001
-+++ Makefile	Mon May 21 10:23:59 2001
+--- Makefile.orig	Thu May 24 17:40:39 2001
++++ Makefile	Mon May 28 14:04:46 2001
 @@ -1,12 +1,12 @@
 -CC        = gcc
 -CFLAGS    = -g -O2 -Wall
@@ -17,6 +17,26 @@ $FreeBSD$
  PROG      = oroborus
 -PREFIX    = /usr
 +PREFIX    ?= /usr
- DEFFILE   = $(PROG)rc
- RCFILE    = .$(PROG)rc
- DATADIR   = $(PREFIX)/share/$(PROG)
+ FONT      = *-helvetica-bold-r-normal-*-*-120-*
+ THEME     = default
+ RCFILE    = -DRCFILE=\".oroborusrc\"
+@@ -36,10 +36,15 @@
+ 	rm -f $(PROG) $(OBJS) core
+ 
+ install:all
+-	install $(PROG) $(PREFIX)/bin
+-	install -d $(PREFIX)/share/$(PROG)
+-	./install_rc $(PREFIX) $(PROG) $(THEME) $(FONT) > $(PREFIX)/share/$(PROG)/oroborusrc
+-	cp -R pixmaps $(PREFIX)/share/$(PROG)
++	$(BSD_INSTALL_PROGRAM) $(PROG) $(PREFIX)/bin
++	$(MKDIR) $(PREFIX)/share/$(PROG)
++	./install_rc $(PREFIX) $(PROG) $(THEME) $(FONT) > oroborusrc
++	$(BSD_INSTALL_DATA) oroborusrc $(PREFIX)/share/$(PROG)/oroborusrc
++	for dir in agua default defold mac next win95; do \
++		$(MKDIR) $(PREFIX)/share/$(PROG)/pixmaps/$$dir; \
++		$(BSD_INSTALL_DATA) pixmaps/$$dir/[^.]* \
++			$(PREFIX)/share/$(PROG)/pixmaps/$$dir; \
++	done
+ 
+ uninstall:
+ 	rm -f $(PREFIX)/bin/$(PROG)
-- 
cgit