From owner-svn-ports-all@FreeBSD.ORG  Fri May  9 12:22:41 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 51283AA7;
 Fri,  9 May 2014 12:22:41 +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 24BA4DFD;
 Fri,  9 May 2014 12:22:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s49CMfK9032568;
 Fri, 9 May 2014 12:22:41 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s49CMf6X032567;
 Fri, 9 May 2014 12:22:41 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405091222.s49CMf6X032567@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 9 May 2014 12:22:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353450 - head/japanese/epwutil
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, 09 May 2014 12:22:41 -0000

Author: pawel
Date: Fri May  9 12:22:40 2014
New Revision: 353450
URL: http://svnweb.freebsd.org/changeset/ports/353450
QAT: https://qat.redports.org/buildarchive/r353450/

Log:
  - Add staging support
  - Install manpages to correct directory
  - Switch to PLIST_FILES
  - Define DOCS option

Deleted:
  head/japanese/epwutil/pkg-plist
Modified:
  head/japanese/epwutil/Makefile

Modified: head/japanese/epwutil/Makefile
==============================================================================
--- head/japanese/epwutil/Makefile	Fri May  9 12:00:55 2014	(r353449)
+++ head/japanese/epwutil/Makefile	Fri May  9 12:22:40 2014	(r353450)
@@ -3,6 +3,7 @@
 
 PORTNAME=	epwutil
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/epwutil/
 
@@ -10,34 +11,21 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities to manage Japanese EPWING or Electric-Book based CD-ROM
 
 MAKEFILE=	makefile.unx
-MANLANG=	ja
 
 EPWPROGS=	bookinfo catdump squeeze
-EPWDOCS=	epwutil.doc
-EPWDOCDIR=	share/doc/epwutil
 
-NO_STAGE=	yes
-do-install:
-.for file in ${EPWPROGS}
-	cd ${WRKSRC};\
-	${INSTALL_PROGRAM} ${file} ${PREFIX}/bin;\
-	${INSTALL_MAN} ${file}.man ${MANPREFIX}/man/${MANLANG}/cat1/${file}.1
-.if !defined(NOMANCOMPRESS)
-	${GZIP_CMD} ${MANPREFIX}/man/${MANLANG}/cat1/${file}.1
-.endif
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${EPWDOCDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} ${EPWDOCS} ${PREFIX}/${EPWDOCDIR}
-.endif
+PLIST_FILES=	${EPWPROGS:S|^|bin/|} ${EPWPROGS:S|^|man/ja/man1/|:S|$|.1.gz|}
+PORTDOCS=	epwutil.doc
 
-post-install:
+OPTIONS_DEFINE=	DOCS
+
+do-install:
 .for file in ${EPWPROGS}
-	${ECHO_CMD} man/${MANLANG}/cat1/${file}.1${MANEXT} >> ${TMPPLIST}
+	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${file}.man \
+		${STAGEDIR}${MANPREFIX}/man/ja/man1/${file}.1
 .endfor
-.if !defined(NOPORTDOCS)
-	${ECHO_CMD} ${EPWDOCDIR}/${EPWDOCS} >> ${TMPPLIST}
-	${ECHO_CMD} "@dirrm ${EPWDOCDIR}" >> ${TMPPLIST}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>