Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Mar 2014 21:23:36 +0200 (EET)
From:      Johannes Jost Meixner <xmj@chaot.net>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        jmohacsi@bsd.hu
Subject:   ports/187503: [PATCH] games/linux-hohlin: Stagedir, Makefile cleanup
Message-ID:  <4262333432003456657.enqueue@mx12.chaot.net>
Resent-Message-ID: <201403121930.s2CJU1Fs060924@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         187503
>Category:       ports
>Synopsis:       [PATCH] games/linux-hohlin: Stagedir, Makefile cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 12 19:30:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Johannes Jost Meixner
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar  9 15:34:03 EET
>Description:
- Stagify
- Deprecate NOPORTDOCS and USE_BZIP2

Port maintainer (jmohacsi@bsd.hu) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- linux-hohlin-1.01.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 347997)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hohlin
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 #MASTER_SITES=	http://retrospec.sgn.net/download.php?id=63&path=games/hoh/bin/
 #requires post to download
@@ -16,32 +16,29 @@
 
 WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/
 
-USE_BZIP2=	YES
+USES=	tar:bzip2
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/data/HoH
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/data/HoH ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/data/HoHOriginal.dat ${DATADIR}
-	${MKDIR} ${DATADIR}/Sound
-	${INSTALL_DATA} ${WRKSRC}/data/Sound/Sound.dat ${DATADIR}/Sound/
-	${INSTALL_DATA} ${WRKSRC}/data/Sound/Game.ogg ${DATADIR}/Sound/
-	${INSTALL_DATA} ${WRKSRC}/data/Sound/Theme.ogg ${DATADIR}/Sound/
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/data/HoH ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/data/HoHOriginal.dat ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/Sound
+	${INSTALL_DATA} ${WRKSRC}/data/Sound/Sound.dat ${STAGEDIR}${DATADIR}/Sound/
+	${INSTALL_DATA} ${WRKSRC}/data/Sound/Game.ogg ${STAGEDIR}${DATADIR}/Sound/
+	${INSTALL_DATA} ${WRKSRC}/data/Sound/Theme.ogg ${STAGEDIR}${DATADIR}/Sound/
 	${SED} -e 's:%%DATADIR%%:${DATADIR}:g' ${FILESDIR}/hoh.sh > \
-		${PREFIX}/bin/HoH
-	${CHMOD} +x ${PREFIX}/bin/HoH
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
+		${STAGEDIR}${PREFIX}/bin/HoH
+	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/HoH
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${CP} -R ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- linux-hohlin-1.01.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4262333432003456657.enqueue>