Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jul 2018 12:49:57 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475551 - in head/games/opensurge: . files
Message-ID:  <201807281249.w6SCnvSk090151@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Jul 28 12:49:57 2018
New Revision: 475551
URL: https://svnweb.freebsd.org/changeset/ports/475551

Log:
  games/opensurge: Cleanup port
  
  - Remove double alfont build dependency
  - Fold Makefile.svn_rev into Makefile
  - Move ICON_SIZES into the one place it is used
  - dumb-allegro is a static library having it as a run dependency
    makes no sense
  - Add missing lib dependencies on libalure and libpng
  - Remove pkg-message
  - Remove pkg-deinstall (Poudriere reports that the filesystem is clean after
    deinstallation and it is unclear how files would be even be created in
    ${DATADIR} without doing curious things like running opensurge as root)
  - Add USES=localbase and build with Clang
  - Fix bad absolute symlink
  - Mark LLD_UNSAFE because of the audio/openal-soft dependency [1]
  
  PR:	226980 [1]

Deleted:
  head/games/opensurge/Makefile.svn_rev
  head/games/opensurge/files/pkg-deinstall.in
  head/games/opensurge/files/pkg-message.in
Modified:
  head/games/opensurge/Makefile

Modified: head/games/opensurge/Makefile
==============================================================================
--- head/games/opensurge/Makefile	Sat Jul 28 12:40:29 2018	(r475550)
+++ head/games/opensurge/Makefile	Sat Jul 28 12:49:57 2018	(r475551)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opensurge
 PORTVERSION=	0.1.r${SVN_REV}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.ime.usp.br/~alemart/opensurge_nightly/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
@@ -18,34 +18,32 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/licenses/GPLv2.txt
 LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/licenses/CC-BY-SA-3.0.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro \
-		${LOCALBASE}/include/alfont.h:x11-fonts/alfont \
-		alureplay:audio/alure
+BUILD_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro
 LIB_DEPENDS=	libalfont.so:x11-fonts/alfont \
 		liballeg.so:devel/allegro \
+		libalure.so:audio/alure \
+		libpng.so:graphics/png \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis
-RUN_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-build${SVN_REV}
 
-USES=		cmake dos2unix openal:soft
+USES=		cmake dos2unix localbase openal:soft
 DOS2UNIX_GLOB=	*.bg *.brk *.grp  *.inc *.lev *.lng  *.obj *.qst *.spr *.txt
-USE_GCC=	yes
 
 PORTDOCS=	readme.html
 PORTDATA=	*
 OPTIONS_DEFINE=	DOCS
 
-SUB_FILES=	${PORTNAME} pkg-deinstall pkg-message
+SUB_FILES=	${PORTNAME}
 
-INSTALLS_ICONS=	yes
-ICON_SIZES=	16x16 32x32 48x48 64x64 72x72 96x96 128x128 256x256
-
 DESKTOP_ENTRIES="Open Surge" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
+INSTALLS_ICONS=	yes
+LLD_UNSAFE=	yes
 
-.include "Makefile.svn_rev"
+SVN_REV=	765
+MODS_VER=	20140321
 
 post-extract-script:
 	@(cd ${WRKDIR}/opensurge-mods && ${COPYTREE_SHARE} . ${WRKSRC})
@@ -68,15 +66,16 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
-.for s in ${ICON_SIZES}
+.for s in 16x16 32x32 48x48 64x64 72x72 96x96 128x128 256x256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
 	${INSTALL_DATA} ${WRKSRC}/src/misc/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+	${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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