switch to REVISION/EPOCH

avsm · Jul 24, 2010 · 94c3766 · 94c3766
1 parent b480801
commit 94c3766
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/plan9/9libs/Makefile b/plan9/9libs/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.12 2009/11/01 22:39:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2010/07/24 15:29:47 naddy Exp $
 
 # varargs misuse, and unportable software
 ONLY_FOR_ARCHS= 	i386 sparc sparc64
 
 COMMENT=		Plan 9 compatibility libraries
 
 DISTNAME=		9libs-1.0
-PKGNAME=		${DISTNAME}p5
+REVISION=		5
 CATEGORIES=		plan9 devel
 SHARED_LIBS=		Xg	0.0 \
 			frame	0.0 \

diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/24 15:29:47 naddy Exp $
 
 COMMENT=	simple menu patterned after plan9
 
 DISTNAME=	9menu-1.7
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 CATEGORIES=	plan9
 
 MASTER_SITES=	ftp://ftp.freefriends.org/arnold/Source/

diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/24 15:29:47 naddy Exp $
 
 COMMENT=	8 1/2-like Window Manager for X11
 
 DISTNAME=	pre-9wm-1.2
-PKGNAME=	9wm-1.2prep1
+PKGNAME=	9wm-1.2pre
+REVISION=	1
 CATEGORIES=	plan9
 
 MASTER_SITES=	http://www.plig.org/xwinman/archive/9wm/

diff --git a/plan9/larswm/Makefile b/plan9/larswm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/24 15:29:47 naddy Exp $
 
 COMMENT=	9wm with automatic window tiling and virtual desktops
 
 DISTNAME=	larswm-7.5.3
-PKGNAME=	${DISTNAME}p2
+REVISION=	2
 CATEGORIES=	plan9
 
 HOMEPAGE=	http://www.lab1702.net/fnurt/larswm/

diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/24 15:29:47 naddy Exp $
 
 COMMENT=	X11 version of Rob Pike's editor, sam
 
 DISTNAME=	sam
-PKGNAME=	sam-4.3.19980506p0
+PKGNAME=	sam-4.3.19980506
+REVISION=	0
 CATEGORIES=	plan9
 
 MASTER_SITES=	ftp://netlib.bell-labs.com/netlib/research/ \

diff --git a/plan9/w9wm/Makefile b/plan9/w9wm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.16 2010/07/24 15:29:47 naddy Exp $
 
 COMMENT=	hacked 9wm, with support for virtual screens
 
 DISTNAME=	w9wm-0.4.2
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 CATEGORIES=	plan9
 
 HOMEPAGE=	http://www.grassouille.org/code/w9wm.en.html

diff --git a/plan9/wily/Makefile b/plan9/wily/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2010/01/27 10:24:52 kili Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/24 15:29:47 naddy Exp $
 
 COMMENT=	clone of the Plan9 editor 'acme'
 
 VERSION=	0.13.41
 DISTNAME=	wily-9libs
-PKGNAME=	${DISTNAME:S/-/_/}-${VERSION}v0
+PKGNAME=	${DISTNAME:S/-/_/}-${VERSION}
+EPOCH=		0
 CATEGORIES=	plan9 editors
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/src/
 
@@ -17,9 +18,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xt c m pthread-stubs xcb
+WANTLIB=		ICE SM X11 Xg Xt c frame m plan9c pthread-stubs xcb
 
-LIB_DEPENDS=		Xg,frame,plan9c::plan9/9libs
+LIB_DEPENDS=		::plan9/9libs
 
 SEPARATE_BUILD=		simple
 USE_X11=		Yes