pkgsrc-WIP-changes archive

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

efgallery: pkglint fixes; remove unused code in Makefile



Module Name:	pkgsrc-wip
Committed By:	ast <ast%NetBSD.org@localhost>
Pushed By:	ast
Date:		Sun Apr 7 09:28:57 2019 +0200
Changeset:	a76a618d2c46926832b0f9e02bff0d8fe0d69e28

Modified Files:
	efgallery/Makefile

Log Message:
efgallery: pkglint fixes; remove unused code in Makefile

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

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

diffstat:
 efgallery/Makefile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diffs:
diff --git a/efgallery/Makefile b/efgallery/Makefile
index 8dab6775b4..da06bc9ae1 100644
--- a/efgallery/Makefile
+++ b/efgallery/Makefile
@@ -3,7 +3,7 @@
 PORTVERSION=	2.4
 PKGBASE=	efgallery
 DISTNAME=	${PKGBASE}-${PORTVERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 
 MASTER_SITES=	${MASTER_SITE_GITHUB:=0-ast-0/}
@@ -30,17 +30,11 @@ DEPENDS+=	p5-Image-ExifTool>=10.0:../../graphics/p5-Image-ExifTool
 EFG_SHAREDIR=	share/${PKGBASE}
 EFG_VIEWDIR=	share/${PKGBASE}/view
 
-SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		post-patch
-SUBST_MESSAGE.fix-paths=	Fixing ${EFG_VIEWDIR} path.
-SUBST_FILES.fix-paths=		efgallery
-SUBST_SED.fix-paths=		-e "s,%%EFG_VIEWDIR%%,${PREFIX}/${EFG_VIEWDIR},g"
-
 SUBST_CLASSES+=		fix-vers
-SUBST_STAGE.fix-vers=	post-patch
-SUBST_MESSAGE.fix-vers=	Setting version to ${PKGVERSION:C/^.*-//}.
+SUBST_STAGE.fix-vers=	pre-configure
 SUBST_FILES.fix-vers=	efgallery
-SUBST_SED.fix-vers=	-e "s,\"${PORTVERSION}\",\"${PKGVERSION:C/^.*-//}\","
+SUBST_MESSAGE.fix-vers=	Setting version in ${SUBST_FILES.fix-vers} to ${PKGVERSION:C/^.*-//}.
+SUBST_SED.fix-vers=	-e "/^our/ s,\"${PORTVERSION}\",\"${PKGVERSION:C/^.*-//}\","
 
 EFG_DOCS=	COPYING.txt README.md
 EFG_SRCDIR=	${WRKDIR}/${DISTNAME}


Home | Main Index | Thread Index | Old Index