4 files changed, 21 insertions, 11 deletions

diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index bf1f9dd63678..aa34da61c92e 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	oroborus
-PORTVERSION=	1.3.1
+PORTVERSION=	1.10
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/
 DISTNAME=	${PORTNAME}-src-v${PORTVERSION}
@@ -20,7 +20,11 @@ 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}/[^.]* \
diff --git a/x11-wm/oroborus/distinfo b/x11-wm/oroborus/distinfo
index 097a23880b93..b5d3ac12a45f 100644
--- a/x11-wm/oroborus/distinfo
+++ b/x11-wm/oroborus/distinfo
@@ -1 +1 @@
-MD5 (oroborus-src-v1.3.1.tar.gz) = d4f0121cb884fb0cdd2e46c6f6695295
+MD5 (oroborus-src-v1.10.tar.gz) = cecb857ee9ce9c7b3c2030da26451231
diff --git a/x11-wm/oroborus/files/patch-Makefile b/x11-wm/oroborus/files/patch-Makefile
index b8758282216a..484963c3ab6a 100644
--- a/x11-wm/oroborus/files/patch-Makefile
+++ b/x11-wm/oroborus/files/patch-Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile	2001/04/19 07:33:49	1.1
-+++ Makefile	2001/04/19 07:37:13
-@@ -1,6 +1,6 @@
+--- Makefile.orig	Mon May 21 00:33:34 2001
++++ Makefile	Mon May 21 10:23:59 2001
+@@ -1,12 +1,12 @@
 -CC        = gcc
 -CFLAGS    = -g -O2 -Wall
 -XROOT     = /usr/X11R6
@@ -11,14 +11,12 @@ $FreeBSD$
 +CFLAGS    ?= -g -O2 -Wall
 +XROOT     = $(X11BASE)
  INCLUDES  = -I$(XROOT)/include
- LIBS      = -lX11 -lXext -lXpm
+ LIBS      = -lX11 -lXext -lXpm #-lXinerama
  LDPATH    = -L$(XROOT)/lib
-@@ -8,7 +8,7 @@
+ 
  PROG      = oroborus
- RCFILE    = .$(PROG)rc
- DEFINES   = -DSHAPE_SUPPORT -DWORKSPACE_SUPPORT #-DDEBUG
 -PREFIX    = /usr
 +PREFIX    ?= /usr
+ DEFFILE   = $(PROG)rc
+ RCFILE    = .$(PROG)rc
  DATADIR   = $(PREFIX)/share/$(PROG)
- PIXMAPDIR = $(DATADIR)/pixmaps/default
- 
diff --git a/x11-wm/oroborus/pkg-plist b/x11-wm/oroborus/pkg-plist
index 68375be02bf2..e03e67676696 100644
--- a/x11-wm/oroborus/pkg-plist
+++ b/x11-wm/oroborus/pkg-plist
@@ -1,4 +1,5 @@
 bin/oroborus
+share/oroborus/oroborusrc
 share/oroborus/pixmaps/agua/bottom-active.xpm
 share/oroborus/pixmaps/agua/bottom-inactive.xpm
 share/oroborus/pixmaps/agua/bottom-left-active.xpm
@@ -103,12 +104,19 @@ share/oroborus/pixmaps/next/resize-active.xpm
 share/oroborus/pixmaps/next/resize-inactive.xpm
 share/oroborus/pixmaps/next/right-active.xpm
 share/oroborus/pixmaps/next/right-inactive.xpm
+share/oroborus/pixmaps/next/themerc
 share/oroborus/pixmaps/next/title-active.xpm
 share/oroborus/pixmaps/next/title-inactive.xpm
+share/oroborus/pixmaps/next/title-shaded-active.xpm
+share/oroborus/pixmaps/next/title-shaded-inactive.xpm
 share/oroborus/pixmaps/next/top-left-active.xpm
 share/oroborus/pixmaps/next/top-left-inactive.xpm
+share/oroborus/pixmaps/next/top-left-shaded-active.xpm
+share/oroborus/pixmaps/next/top-left-shaded-inactive.xpm
 share/oroborus/pixmaps/next/top-right-active.xpm
 share/oroborus/pixmaps/next/top-right-inactive.xpm
+share/oroborus/pixmaps/next/top-right-shaded-active.xpm
+share/oroborus/pixmaps/next/top-right-shaded-inactive.xpm
 share/oroborus/pixmaps/win95/bottom-active.xpm
 share/oroborus/pixmaps/win95/bottom-inactive.xpm
 share/oroborus/pixmaps/win95/bottom-left-active.xpm