From bb2a5c3f765d6ed2caea31e2acacfdbefb46a633 Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Mon, 15 Nov 2004 21:35:43 +0000
Subject: [PATCH] don't use versioned subdirs in share/ bump PKGNAME

noticed by xsa@
---
 mail/getmail/Makefile               |  9 +++----
 mail/getmail/patches/patch-setup_py | 14 +++++++---
 mail/getmail/pkg/PLIST              | 40 ++++++++++++++---------------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index d9bc5695bad..dabf387cd82 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2004/10/31 20:30:15 sturm Exp $
+# $OpenBSD: Makefile,v 1.26 2004/11/15 21:35:43 sturm Exp $
 
 COMMENT=	"POP3 mail retriever"
 
-V=		4.2.2
-DISTNAME=	getmail-${V}
+DISTNAME=	getmail-4.2.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	mail
 
 HOMEPAGE=	http://www.qcc.ca/~charlesc/software/getmail-4/
@@ -22,8 +22,7 @@ MODULES=	lang/python
 
 NO_REGRESS=	Yes
 
-EXDIR=		${PREFIX}/share/examples/getmail-${V}
-SUBST_VARS+=	V
+EXDIR=		${PREFIX}/share/examples/getmail
 
 post-install:
 	${INSTALL_DATA_DIR} ${EXDIR}
diff --git a/mail/getmail/patches/patch-setup_py b/mail/getmail/patches/patch-setup_py
index b252b777ad7..80029ea1beb 100644
--- a/mail/getmail/patches/patch-setup_py
+++ b/mail/getmail/patches/patch-setup_py
@@ -1,7 +1,13 @@
-$OpenBSD: patch-setup_py,v 1.1 2004/10/31 20:30:15 sturm Exp $
---- setup.py.orig	Sun Aug 29 17:10:57 2004
-+++ setup.py	Sun Aug 29 17:11:06 2004
-@@ -44,7 +44,6 @@ GETMAILDOCDIR = os.path.join(
+$OpenBSD: patch-setup_py,v 1.2 2004/11/15 21:35:43 sturm Exp $
+--- setup.py.orig	Wed Aug  4 18:41:16 2004
++++ setup.py	Mon Nov 15 22:31:49 2004
+@@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join(
+     datadir or prefix,
+     'share',
+     'doc',
+-    'getmail-%s' % __version__
++    'getmail'
+ )
  
  GETMAILMANDIR = os.path.join(
      datadir or prefix,
diff --git a/mail/getmail/pkg/PLIST b/mail/getmail/pkg/PLIST
index f6b3b7ef490..229706b372f 100644
--- a/mail/getmail/pkg/PLIST
+++ b/mail/getmail/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/10/31 20:30:16 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.9 2004/11/15 21:35:43 sturm Exp $
 bin/getmail
 bin/getmail_maildir
 bin/getmail_mbox
@@ -30,22 +30,22 @@ lib/python${MODPY_VERSION}/site-packages/getmailcore/utilities.pyc
 @man man/man1/getmail.1
 @man man/man1/getmail_maildir.1
 @man man/man1/getmail_mbox.1
-share/doc/getmail-${V}/
-share/doc/getmail-${V}/BUGS
-share/doc/getmail-${V}/CHANGELOG
-share/doc/getmail-${V}/COPYING
-share/doc/getmail-${V}/README
-share/doc/getmail-${V}/THANKS
-share/doc/getmail-${V}/TODO
-share/doc/getmail-${V}/configuration.html
-share/doc/getmail-${V}/configuration.txt
-share/doc/getmail-${V}/documentation.html
-share/doc/getmail-${V}/documentation.txt
-share/doc/getmail-${V}/faq.html
-share/doc/getmail-${V}/faq.txt
-share/doc/getmail-${V}/getmaildocs.css
-share/doc/getmail-${V}/getmailrc-examples
-share/doc/getmail-${V}/troubleshooting.html
-share/doc/getmail-${V}/troubleshooting.txt
-share/examples/getmail-${V}/
-share/examples/getmail-${V}/getmailrc-examples
+share/doc/getmail/
+share/doc/getmail/BUGS
+share/doc/getmail/CHANGELOG
+share/doc/getmail/COPYING
+share/doc/getmail/README
+share/doc/getmail/THANKS
+share/doc/getmail/TODO
+share/doc/getmail/configuration.html
+share/doc/getmail/configuration.txt
+share/doc/getmail/documentation.html
+share/doc/getmail/documentation.txt
+share/doc/getmail/faq.html
+share/doc/getmail/faq.txt
+share/doc/getmail/getmaildocs.css
+share/doc/getmail/getmailrc-examples
+share/doc/getmail/troubleshooting.html
+share/doc/getmail/troubleshooting.txt
+share/examples/getmail/
+share/examples/getmail/getmailrc-examples