Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jan 2014 16:19:56 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341238 - head/textproc/dixit
Message-ID:  <201401261619.s0QGJuJL018933@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Sun Jan 26 16:19:56 2014
New Revision: 341238
URL: http://svnweb.freebsd.org/changeset/ports/341238
QAT: https://qat.redports.org/buildarchive/r341238/

Log:
  Convert to staging.
  
  Sponsored by:	Absolight

Modified:
  head/textproc/dixit/Makefile
  head/textproc/dixit/pkg-plist

Modified: head/textproc/dixit/Makefile
==============================================================================
--- head/textproc/dixit/Makefile	Sun Jan 26 16:16:35 2014	(r341237)
+++ head/textproc/dixit/Makefile	Sun Jan 26 16:19:56 2014	(r341238)
@@ -22,9 +22,10 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 USES=		qmake
 USE_QT4=	corelib gui network moc_build rcc_build
-LDFLAGS=	-lz
+LDFLAGS+=	-lz
 
-PLIST_SUB=	_DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F}
+PLIST_SUB=	_DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F} \
+		DB_OWNER=${DB_OWNER} DB_GROUP=${DB_GROUP} DB_MODE=${DB_MODE}
 
 QT_VER=		4
 
@@ -40,7 +41,6 @@ _DB_D=	${PORTNAME}.qdb.tar.bz2
 _DB_F=	${PORTNAME}.qdb
 _DB=	${DB_DIR}/${_DB_F}
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Your dictionary database directory is:"
@@ -61,15 +61,14 @@ post-patch:
 		's|dixit.qdb|${_DB}|' ${WRKSRC}/src/dixit.h
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DB_DIR}
 	@${TOUCH} -t ${DB_DATE} ${WRKSRC}/${_DB_F}
 	@${ECHO_MSG} "	===> Installing database ... .. ."
 	@if [ ! -e "${_DB}" -o "${_DB}" -ot "${WRKSRC}/${_DB_F}" ]; \
-		then	${TAR} -C ${DB_DIR:S/${PORTNAME}//} -xf ${DISTDIR}/${_DB_D} && \
+		then	${TAR} -C ${STAGEDIR}${DB_DIR:S/${PORTNAME}//} -xf ${DISTDIR}/${_DB_D} && \
 			${ECHO_MSG} "	===> ... Done."; \
 		else	${ECHO_MSG} "	===> Exisitng database is newer, skiping";\
 	fi
-	@${CHOWN} ${DB_OWNER}:${DB_GROUP} ${_DB}
-	@${CHMOD} ${DB_MODE} ${_DB}
 
 .include <bsd.port.mk>

Modified: head/textproc/dixit/pkg-plist
==============================================================================
--- head/textproc/dixit/pkg-plist	Sun Jan 26 16:16:35 2014	(r341237)
+++ head/textproc/dixit/pkg-plist	Sun Jan 26 16:19:56 2014	(r341238)
@@ -4,3 +4,5 @@ bin/dixit
 LICENSE.GPL3
 @cwd /
 @dirrm %%DB_DIR%%
+@exec chown %%DB_OWNER%%:%%DB_GROUP%% %%DB_DIR/%%_DB_F%%
+@exec chmod %%DB_MODE%% %%DB_DIR/%%_DB_F%%



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