Comment 1 Edwin Groothuis 2014-02-09 23:00:08 UTC

Class Changed
From-To: update->maintainer-update

Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool)

Comment 2 Ruslan Makhmatkhanov 2014-02-10 20:20:37 UTC

Responsible Changed
From-To: freebsd-ports-bugs->rm

I will take it.

Comment 3 dfilter service 2014-02-10 20:34:45 UTC

Author: rm
Date: Mon Feb 10 20:34:32 2014
New Revision: 343680
URL: http://svnweb.freebsd.org/changeset/ports/343680
QAT: https://qat.redports.org/buildarchive/r343680/

Log:
  - update to 3.9.0
  
  while here:
  - add stage support
  - convert USE_DOS2UNIX to USES
  - install docs unconditionally into stage area
  
  PR:		186612
  Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)

Modified:
  head/games/megaglest-data/Makefile
  head/games/megaglest-data/distinfo

Modified: head/games/megaglest-data/Makefile
==============================================================================
--- head/games/megaglest-data/Makefile	Mon Feb 10 20:27:22 2014	(r343679)
+++ head/games/megaglest-data/Makefile	Mon Feb 10 20:34:32 2014	(r343680)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	megaglest
-PORTVERSION=	3.7.1
+PORTVERSION=	3.9.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
 PKGNAMESUFFIX=	-data
@@ -11,15 +11,17 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	MegaGlest data files
 
+USES=		dos2unix
+DOS2UNIX_GLOB=	*.log *.ini *.html *.txt *.lng
 USE_XZ=		yes
-USE_DOS2UNIX=	*.log *.ini *.html *.txt *.lng
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 PLIST=		${WRKDIR}/pkg-plist
+BASEDOCS=	AUTHORS.data.txt README.data-license.txt \
+		cc-by-sa-3.0-unported.txt COPYRIGHT.data.txt
+PORTDOCS=	*
 
-NO_STAGE=	yes
 pre-install:
 	${RM} -f ${PLIST}
 .for DIR in data maps scenarios techs tilesets tutorials
@@ -33,29 +35,19 @@ pre-install:
 	@${ECHO_CMD} "@dirrmtry share/icons" >> ${PLIST}
 	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
 
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/docs && \
-		${FIND} * -type f | ${GREP} -v CHANGELOG.txt | ${GREP} -v README.txt | ${SORT} | ${SED} -e 's|^|%%PORTDOCS%%%%DOCSDIR%%/|' >> ${PLIST} && \
-			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|%%PORTDOCS%%@dirrm %%DOCSDIR%%/|' >> ${PLIST}
-	@${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST}
-.endif
-
 do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/glest_factions
-.for f in AUTHORS.data.txt README.data-license.txt cc-by-sa-3.0-unported.txt COPYRIGHT.data.txt
-	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
-.endfor
-	(cd ${WRKSRC}/docs/glest_factions && ${COPYTREE_SHARE} "*" ${DOCSDIR}/glest_factions)
-.endif
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/megaglest.desktop ${PREFIX}/share/applications/
-	${MKDIR} ${PREFIX}/share/icons
-	${INSTALL_DATA} ${WRKSRC}/megaglest.png ${PREFIX}/share/icons/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/glest_factions
+	${INSTALL_DATA} ${BASEDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/glest_factions && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/glest_factions)
+
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
+	${INSTALL_DATA} ${WRKSRC}/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/
 
 .for DIR in data maps scenarios techs tilesets tutorials
-	${MKDIR} ${DATADIR}/${DIR}
-	(cd ${WRKSRC}/${DIR} && ${COPYTREE_SHARE} "*" ${DATADIR}/${DIR})
+	${MKDIR} ${STAGEDIR}${DATADIR}/${DIR}
+	(cd ${WRKSRC}/${DIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${DIR})
 .endfor
 
 .include <bsd.port.mk>

Modified: head/games/megaglest-data/distinfo
==============================================================================
--- head/games/megaglest-data/distinfo	Mon Feb 10 20:27:22 2014	(r343679)
+++ head/games/megaglest-data/distinfo	Mon Feb 10 20:34:32 2014	(r343680)
@@ -1,2 +1,2 @@
-SHA256 (megaglest-data-3.7.1.tar.xz) = e31a84d32e35bd1b96ebba55188d05099411497dae4bad2ece9cb0cea5723b0d
-SIZE (megaglest-data-3.7.1.tar.xz) = 191777052
+SHA256 (megaglest-data-3.9.0.tar.xz) = e6d6fdc994a6cc99e00bafda53537964ba069bb4bdcb3257dcbe4f7434011fc2
+SIZE (megaglest-data-3.9.0.tar.xz) = 269393520
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 4 Ruslan Makhmatkhanov 2014-02-10 20:34:50 UTC

State Changed
From-To: open->closed

Committed, thank you!