Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 May 2014 00:43:17 +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: r355763 - head/www/dalbum
Message-ID:  <201405300043.s4U0hHls018649@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri May 30 00:43:17 2014
New Revision: 355763
URL: http://svnweb.freebsd.org/changeset/ports/355763
QAT: https://qat.redports.org/buildarchive/r355763/

Log:
  www/dalbum: Add stage support
  
  * Remove unnecessary post-extract target by use of NO_WRKSUBDIR
  * Wrap to 80 columns
  * pet portlint a bit

Modified:
  head/www/dalbum/Makefile

Modified: head/www/dalbum/Makefile
==============================================================================
--- head/www/dalbum/Makefile	Fri May 30 00:26:39 2014	(r355762)
+++ head/www/dalbum/Makefile	Fri May 30 00:43:17 2014	(r355763)
@@ -12,33 +12,25 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Free, highly customizable PHP photo album
 
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+
 USE_PHP=	session pcre
 NO_BUILD=	yes
 
 DALBUM_DIR?=	www/photo
+NO_WRKSUBDIR=	yes
 
 PLIST_SUB+=	DALBUM_DIR=${DALBUM_DIR}
 SUB_LIST+=	DALBUM_DIR=${DALBUM_DIR}
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} -p ${WRKSRC}
-	@if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTFILES} ${EXTRACT_AFTER_ARGS});\
-	then \
-		exit 1; \
-	fi
-
 post-patch:
 	@${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" ${WRKSRC}/config/config.php
 	@${RM} ${WRKSRC}/config/config.php.*
 
 do-install:
-	@${MKDIR} -m 0775 ${PREFIX}/${DALBUM_DIR}
-	@cd ${WRKSRC} && ${FIND} . -print | ${CPIO} --quiet -pdum -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DALBUM_DIR}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} -m 0775 ${STAGEDIR}${PREFIX}/${DALBUM_DIR}
+	@cd ${WRKSRC} && ${FIND} . -print | \
+		${CPIO} --quiet -pdum -R ${WWWOWN}:${WWWGRP} \
+		${STAGEDIR}${PREFIX}/${DALBUM_DIR}
 
 .include <bsd.port.mk>



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