From owner-svn-ports-all@FreeBSD.ORG  Fri May 30 00:43:18 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2EDD195;
 Fri, 30 May 2014 00:43:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C0472992;
 Fri, 30 May 2014 00:43:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U0hHeN018650;
 Fri, 30 May 2014 00:43:17 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4U0hHls018649;
 Fri, 30 May 2014 00:43:17 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201405300043.s4U0hHls018649@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Fri, 30 May 2014 00:43:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355763 - head/www/dalbum
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 May 2014 00:43:18 -0000

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>