pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

moreutils: cosmetic reorganization (following doc/Makefile-example practices)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue May 9 09:26:27 2017 +0200
Changeset:	492304fef2e6a4a83e504d4b9cc7d0db9144be3d

Modified Files:
	moreutils/Makefile

Log Message:
moreutils: cosmetic reorganization (following doc/Makefile-example practices)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=492304fef2e6a4a83e504d4b9cc7d0db9144be3d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 moreutils/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diffs:
diff --git a/moreutils/Makefile b/moreutils/Makefile
index e1322beb26..7af2df07a1 100644
--- a/moreutils/Makefile
+++ b/moreutils/Makefile
@@ -11,19 +11,14 @@ HOMEPAGE=	https://joeyh.name/code/moreutils/
 COMMENT=	Additional Unix utilities
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake pod2man perl:run
-
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILD_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
 DEPENDS+=	p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
 
-SUBST_CLASSES+=			pkgmandir
-SUBST_STAGE.pkgmandir=		pre-configure
-SUBST_FILES.pkgmandir=		Makefile
-SUBST_MESSAGE.pkgmandir=	Fixing man page installation.
-SUBST_SED.pkgmandir=		-e 's,share/man,${PKGMANDIR},'
+USE_TOOLS+=	gmake pod2man perl:run
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 REPLACE_PERL+=	chronic
 REPLACE_PERL+=	combine
@@ -32,6 +27,12 @@ REPLACE_PERL+=	vidir
 REPLACE_PERL+=	vipe
 REPLACE_PERL+=	zrun
 
+SUBST_CLASSES+=			pkgmandir
+SUBST_STAGE.pkgmandir=		pre-configure
+SUBST_FILES.pkgmandir=		Makefile
+SUBST_MESSAGE.pkgmandir=	Fixing man page installation.
+SUBST_SED.pkgmandir=		-e 's,share/man,${PKGMANDIR},'
+
 MAKE_ENV+=	\
 	PREFIX=${PREFIX} \
 	CFLAGS=${CFLAGS:Q} \
@@ -40,6 +41,4 @@ MAKE_ENV+=	\
 	INSTALL_MAN=${INSTALL_MAN:Q} \
 	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index