Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Dec 2014 01:15:35 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r375763 - head/games/duke3d-data
Message-ID:  <201412290115.sBT1FZu4095742@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Dec 29 01:15:34 2014
New Revision: 375763
URL: https://svnweb.freebsd.org/changeset/ports/375763
QAT: https://qat.redports.org/buildarchive/r375763/

Log:
  - Fix dependent ports, they should not depend on directory

Modified:
  head/games/duke3d-data/Makefile
  head/games/duke3d-data/Makefile.include
  head/games/duke3d-data/pkg-plist

Modified: head/games/duke3d-data/Makefile
==============================================================================
--- head/games/duke3d-data/Makefile	Mon Dec 29 01:15:15 2014	(r375762)
+++ head/games/duke3d-data/Makefile	Mon Dec 29 01:15:34 2014	(r375763)
@@ -3,7 +3,7 @@
 
 PORTNAME=	data
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.3drealms.com/share/ \
 		ftp://ftp.kiarchive.ru/pub/.1/msdos/games/play/3d/ \
@@ -27,7 +27,7 @@ NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	SHAREWARE
 SHAREWARE_DESC=	Install shareware game data version 1.3
 
-DATADIR=	${DN3DDIR}
+DATADIR=	${DN3DDIR:C/^${LOCALBASE}/${PREFIX}/}
 
 .include "Makefile.include"
 
@@ -48,6 +48,7 @@ post-extract:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${TOUCH} ${STAGEDIR}${DATADIR}/.keepme
 .if ${PORT_OPTIONS:MSHAREWARE}
 	${INSTALL_DATA} ${WRKSRC}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
 .endif

Modified: head/games/duke3d-data/Makefile.include
==============================================================================
--- head/games/duke3d-data/Makefile.include	Mon Dec 29 01:15:15 2014	(r375762)
+++ head/games/duke3d-data/Makefile.include	Mon Dec 29 01:15:34 2014	(r375763)
@@ -25,5 +25,5 @@ PLIST_SUB+=	DN3DDIR="${DN3DDIR:S/${LOCAL
 SUB_LIST+=	DN3DDIR="${DN3DDIR}"
 
 .if ${PORTNAME} != "data"
-RUN_DEPENDS+=	${DN3DDIR}:${PORTSDIR}/games/duke3d-data
+RUN_DEPENDS+=	${DN3DDIR}/.keepme:${PORTSDIR}/games/duke3d-data
 .endif

Modified: head/games/duke3d-data/pkg-plist
==============================================================================
--- head/games/duke3d-data/pkg-plist	Mon Dec 29 01:15:15 2014	(r375762)
+++ head/games/duke3d-data/pkg-plist	Mon Dec 29 01:15:34 2014	(r375763)
@@ -1,2 +1,2 @@
+%%DATADIR%%/.keepme
 %%SHAREWARE%%%%DATADIR%%/duke3d.grp
-@dir %%DATADIR%%



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