Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Aug 2014 09:36:18 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365538 - head/games/adonthell
Message-ID:  <201408210936.s7L9aIgh063941@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Thu Aug 21 09:36:17 2014
New Revision: 365538
URL: http://svnweb.freebsd.org/changeset/ports/365538
QAT: https://qat.redports.org/buildarchive/r365538/

Log:
  Stage games/adonthell and unbreak on FreeBSD 10+
  
  PR:		192793
  Submitted by:	Ports Fury

Modified:
  head/games/adonthell/Makefile

Modified: head/games/adonthell/Makefile
==============================================================================
--- head/games/adonthell/Makefile	Thu Aug 21 09:05:29 2014	(r365537)
+++ head/games/adonthell/Makefile	Thu Aug 21 09:36:17 2014	(r365538)
@@ -4,7 +4,7 @@
 
 PORTNAME=	adonthell
 PORTVERSION=	0.3.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX} \
@@ -19,42 +19,43 @@ LICENSE_DISTFILES=	${DISTFILES}
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
+USES=		gettext gmake python
 USE_SDL=	mixer ttf sdl
-USE_PYTHON=	yes
-USES=		gettext gmake
+USE_GCC=	any
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYPACKAGE="${PYTHON_CMD}" ac_cv_path_P_SWIG=no
 CONFIGURE_ARGS=	--disable-py-debug
 
-PLIST_SUB=	VERSION="${PORTVERSION:R}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
-WEDGE_VERSION=	0.3.5
+BROKEN_sparc64=	Does not build on sparc64
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+DESKTOP_ENTRIES="Adonthell" "" "" "adonthell" "" ""
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not build on sparc64
-.endif
+WEDGE_VERSION=	0.3.5
 
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e \
 		's|-g -Wall|$$CFLAGS -Wall|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' configure
+		 s|-lpthread|-pthread|g' configure
+	@cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${REINPLACE_CMD} -e \
+		's|@adonthell_binary@|${PREFIX}/bin/adonthell|' Makefile.in
 	@cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${REINPLACE_CMD} -e \
-		's/test $$adonthell_major_ver -eq 0 .*/true ;/' configure
+		's|test $$adonthell_major_ver -eq 0 .*|true ;|' configure
 	@cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${REINPLACE_CMD} -e \
-		's/^[[:space:]]*_//' scripts/modules/player_text.py
+		's|^[[:space:]]*_||' scripts/modules/player_text.py
 
 post-install:
 	cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} \
 		&& ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \
-			--with-adonthell-binary=${PREFIX}/bin/${PORTNAME} \
+			--with-adonthell-binary=${STAGEDIR}${PREFIX}/bin/adonthell \
 			${CONFIGURE_TARGET}
-	cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${MAKE_CMD}
-	cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${MAKE_CMD} install
+	cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${SETENV} HOME=${WRKDIR} \
+		${MAKE_CMD}
+	cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${SETENV} HOME=${WRKDIR} \
+		${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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