Unbreak misc/cheatah by reworking the Makefile of its master port,

misc/sword.

Submitted by:		Willem van Engen <wvengen@stack.nl> (maintainer of both)

5 files changed, 43 insertions, 23 deletions

diff --git a/misc/cheatah/Makefile b/misc/cheatah/Makefile
index 8a7dfb7711f0..dbf911754e5e 100644
--- a/misc/cheatah/Makefile
+++ b/misc/cheatah/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	cheatah
-PORTVERSION=	${MAKE} -V PORTVERSION -f ${MAINDIR}/${MKFILE}
-PORTREVISION=	${MAKE} -V PORTREVISION -f ${MAINDIR}/${MKFILE}
-PORTEPOCH=	${MAKE} -V PORTEPOCH -f ${MAINDIR}/${MKFILE}
+PORTVERSION=	${SWORD_PORTVERSION}
 CATEGORIES=	misc
-DISTFILES=
+MASTER_SITES=	${SWORD_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${SWORD_MASTER_SIZE_SUBDIR}
+DISTNAME=	${SWORD_DISTNAME}
 
 MAINTAINER=	wvengen@stack.nl
 COMMENT=	Temporary gtk GUI to the SWORD project
 
-BROKEN=		"Does not build, will be removed after Feb 2"
-
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/misc/sword:extract
 LIB_DEPENDS=	sword.1:${PORTSDIR}/misc/sword
 RUN_DEPENDS=	${LOCALBASE}/share/sword/mods.d:${PORTSDIR}/misc/sword-modules
 
@@ -25,13 +22,10 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 
-MAINDIR=	${.CURDIR}/../sword
-MKFILE!=	/usr/bin/basename ${MAKEFILE}
-PORTVERSION!=	${PORTVERSION}
-PORTREVISION!=	${PORTREVISION}
-PORTEPOCH!=	${PORTEPOCH}
 PLIST_FILES=	bin/cheatah
-WRKSRC=		${WRKDIRPREFIX}${MAINDIR}/work/sword-${PORTVERSION}/apps/X11/cheatah
+WRKSRC=		${WRKDIR}/${DISTNAME}/apps/X11/cheatah
+
+.include "${.CURDIR}/../sword/Makefile.common"
 
 post-patch:
 	@${CHMOD} a+x ${WRKSRC}/configure
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 7430f08bb6a0..ab79ef08a410 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sword
-PORTVERSION=	1.5.5
+PORTNAME=	${SWORD_PORTNAME}
+PORTVERSION=	${SWORD_PORTVERSION}
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${SWORD_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${SWORD_MASTER_SITE_SUBDIR}
+DISTNAME=	${SWORD_DISTNAME}
 
 MAINTAINER=	wvengen@stack.nl
 COMMENT=	A project framework for manipulating Bible texts
@@ -29,6 +29,8 @@ PLIST_SUB+=	INSTALLMGR=""
 CONFIGURE_ARGS+=	--disable-installmgr
 PLIST_SUB+=	INSTALLMGR="@comment "
 
+.include "${.CURDIR}/Makefile.common"
+
 pre-everything::
 	@${ECHO_CMD} "Define WITH_INSTALLMGR to include the installmanager (curl)"
 .endif
diff --git a/misc/sword/Makefile.common b/misc/sword/Makefile.common
new file mode 100644
index 000000000000..a2731b181964
--- /dev/null
+++ b/misc/sword/Makefile.common
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SWORD_PORTNAME=	sword
+SWORD_PORTVERSION=	1.5.5
+SWORD_MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
+	${MASTER_SITE_SOURCEFORGE}
+SWORD_MASTER_SITE_SUBDIR=	${PORTNAME}
+SWORD_DISTNAME=	${SWORD_PORTNAME}-${SWORD_PORTVERSION}
+
+MD5_FILE?=	${PORTSDIR}/misc/sword/distinfo
+
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index 7430f08bb6a0..ab79ef08a410 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sword
-PORTVERSION=	1.5.5
+PORTNAME=	${SWORD_PORTNAME}
+PORTVERSION=	${SWORD_PORTVERSION}
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${SWORD_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${SWORD_MASTER_SITE_SUBDIR}
+DISTNAME=	${SWORD_DISTNAME}
 
 MAINTAINER=	wvengen@stack.nl
 COMMENT=	A project framework for manipulating Bible texts
@@ -29,6 +29,8 @@ PLIST_SUB+=	INSTALLMGR=""
 CONFIGURE_ARGS+=	--disable-installmgr
 PLIST_SUB+=	INSTALLMGR="@comment "
 
+.include "${.CURDIR}/Makefile.common"
+
 pre-everything::
 	@${ECHO_CMD} "Define WITH_INSTALLMGR to include the installmanager (curl)"
 .endif
diff --git a/misc/sword15/Makefile.common b/misc/sword15/Makefile.common
new file mode 100644
index 000000000000..a2731b181964
--- /dev/null
+++ b/misc/sword15/Makefile.common
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SWORD_PORTNAME=	sword
+SWORD_PORTVERSION=	1.5.5
+SWORD_MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
+	${MASTER_SITE_SOURCEFORGE}
+SWORD_MASTER_SITE_SUBDIR=	${PORTNAME}
+SWORD_DISTNAME=	${SWORD_PORTNAME}-${SWORD_PORTVERSION}
+
+MD5_FILE?=	${PORTSDIR}/misc/sword/distinfo
+