From c3f605aa9b52197fe41f6a244535b358e056c6ab Mon Sep 17 00:00:00 2001
From: Alejandro Pulver <alepulver@FreeBSD.org>
Date: Wed, 18 Mar 2009 02:30:17 +0000
Subject: [PATCH] - Downgrade devel/pdcurses-the version to 3.2 (comes from a
 repocopy). - Add devel/pdcurses-the to the category Makefile. - Add CONFLICTS
 between pdcurses (also bump PORTREVISION so it gets   recorded) and
 pdcurses-the. - Change dependency in editors/the to use devel/pdcurses-the
 (which fixes a   problem with the cursor).

---
 devel/Makefile              | 1 +
 devel/pdcurses-the/Makefile | 6 ++++--
 devel/pdcurses-the/distinfo | 6 +++---
 devel/pdcurses/Makefile     | 4 +++-
 editors/the/Makefile        | 4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/devel/Makefile b/devel/Makefile
index 0eeded2b86d9..8703111fb383 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2011,6 +2011,7 @@
     SUBDIR += pcre++
     SUBDIR += pcsc-lite
     SUBDIR += pdcurses
+    SUBDIR += pdcurses-the
     SUBDIR += pear
     SUBDIR += pear-Config
     SUBDIR += pear-Console_Color
diff --git a/devel/pdcurses-the/Makefile b/devel/pdcurses-the/Makefile
index 1c7788000e12..d056c201e73e 100644
--- a/devel/pdcurses-the/Makefile
+++ b/devel/pdcurses-the/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	pdcurses
-PORTVERSION=	3.3
-PORTREVISION=	2
+PORTVERSION=	3.2
 CATEGORIES=	devel
 MASTER_SITES=	SF
+PKGNAMESUFFIX=	-the
 DISTNAME=	PDCurses-${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Curses library implementation for Win32, DOS, OS/2 and X11
 
+CONFLICTS=	pdcurses-[0-9]*
+
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext sm ice xt xaw
 GNU_CONFIGURE=	yes
diff --git a/devel/pdcurses-the/distinfo b/devel/pdcurses-the/distinfo
index 550a28e8d73c..fe349aff2b4c 100644
--- a/devel/pdcurses-the/distinfo
+++ b/devel/pdcurses-the/distinfo
@@ -1,3 +1,3 @@
-MD5 (PDCurses-3.3.tar.gz) = 96f94dc982158d970bdd1cba6502b414
-SHA256 (PDCurses-3.3.tar.gz) = 04260e49ace3aa1762c6ae1e38549de37da957cfa8592a0ecdb1948dae84a48a
-SIZE (PDCurses-3.3.tar.gz) = 329511
+MD5 (PDCurses-3.2.tar.gz) = 7dc30ea6cad9b73aaca586d6cec41597
+SHA256 (PDCurses-3.2.tar.gz) = e8f3d6af48a1335622bfbfc1b8eafd100a8223b4b41cd658bc5721aa8c7b8543
+SIZE (PDCurses-3.2.tar.gz) = 309232
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 1c7788000e12..774e801249d1 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdcurses
 PORTVERSION=	3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
@@ -15,6 +15,8 @@ DISTNAME=	PDCurses-${PORTVERSION}
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Curses library implementation for Win32, DOS, OS/2 and X11
 
+CONFLICTS=	pdcurses-the-[0-9]*
+
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext sm ice xt xaw
 GNU_CONFIGURE=	yes
diff --git a/editors/the/Makefile b/editors/the/Makefile
index b2b0b50c22eb..832f83ddc627 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	the
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/hessling-editor
 DISTNAME=	THE-${PORTVERSION}
@@ -40,7 +41,8 @@ LIB_DEPENDS+=	Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d
 CONFIGURE_ARGS+=--with-xcurses \
 		--with-cursesincdir=${LOCALBASE}/include \
 		--with-curseslibdir=${LOCALBASE}/lib
-LIB_DEPENDS+=	XCurses.2:${PORTSDIR}/devel/pdcurses
+BUILD_DEPENDS+=	pdcurses-the>=3.2:${PORTSDIR}/devel/pdcurses-the
+LIB_DEPENDS+=	XCurses.2:${PORTSDIR}/devel/pdcurses-the
 PLIST_SUB=	XCURSES="" NCURSES="@comment "
 .else
 PLIST_SUB=	XCURSES="@comment " NCURSES=""