pkgsrc-WIP-changes archive

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

gitea: Fix a few things reported by pkglint



Module Name:	pkgsrc-wip
Committed By:	Antonio Huete Jimenez <tuxillo%quantumachine.net@localhost>
Pushed By:	tuxillo
Date:		Mon Aug 27 21:03:03 2018 +0000
Changeset:	eab791520591a3c50e6511f3e467f958827f3cbb

Modified Files:
	gitea/Makefile

Log Message:
gitea: Fix a few things reported by pkglint

With help from: @leot @nia

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

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

diffstat:
 gitea/Makefile | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diffs:
diff --git a/gitea/Makefile b/gitea/Makefile
index d9906d817b..dc041a2866 100644
--- a/gitea/Makefile
+++ b/gitea/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD$
 
-DISTNAME=	gitea-${PKGVERSION}
-GITHUB_TAG=	v1.5.0
-PKGVERSION=	${GITHUB_TAG:S/v//}
+DISTNAME=	gitea-1.5.0
 MASTER_SITES=	${MASTER_SITE_GITHUB:=go-gitea/}
 CATEGORIES=	www
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=	${PKGBASE:S/^go-//}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	tuxillo%quantumachine.net@localhost
 HOMEPAGE=	https://gitea.io/
@@ -14,13 +13,13 @@ LICENSE=	mit
 
 GO_DIST_BASE=		${GITHUB_PROJECT}-${PKGVERSION}
 GO_SRCPATH=		code.gitea.io/gitea
-GO_BUILD_PATTERN+= 	-tags ${GO_TAGS}
-GO_BUILD_PATTERN+= 	${GO_SRCPATH}
+GO_BUILD_PATTERN+=	-tags ${GO_TAGS}
+GO_BUILD_PATTERN+=	${GO_SRCPATH}
 
-BUILD_DEFS+=	VARBASE
+BUILD_DEFS+=	VARBASE GITEA_USER GITEA_GROUP
 
 USE_TOOLS+=	pax
-DEPENDS+=       git-base-[0-9]*:../../devel/git-base
+DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
 EGDIR=		${PREFIX}/share/examples/gitea
 
@@ -28,27 +27,31 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/gitea ${GITEA_USER} ${GITEA_GROUP} 0755
 OWN_DIRS_PERMS+=	${VARBASE}/db/gitea ${GITEA_USER} ${GITEA_GROUP} 0755
 OWN_DIRS_PERMS+=	${PKGSYSCONFDIR}/conf ${GITEA_USER} ${GITEA_GROUP} 0755
 
-GITEA_USER?=		git
-GITEA_GROUP?=		git
+.include "../../mk/bsd.prefs.mk"
+
+GITEA_USER?=	git
+GITEA_GROUP?=	git
 
-PKG_GROUPS_VARS+=       GITEA_GROUP
-PKG_USERS_VARS+=        GITEA_USER
+PKG_GROUPS_VARS+=	GITEA_GROUP
+PKG_USERS_VARS+=	GITEA_USER
 
-PKG_SYSCONFSUBDIR= gitea
+PKG_SYSCONFSUBDIR=	gitea
 
 INSTALLATION_DIRS+=	sbin share/gitea share/examples/gitea
 
-PKG_GROUPS=             ${GITEA_GROUP}
-PKG_USERS=              ${GITEA_USER}:${GITEA_GROUP}
+PKG_GROUPS=	${GITEA_GROUP}
+PKG_USERS=	${GITEA_USER}:${GITEA_GROUP}
+
 PKG_SHELL.${GITEA_USER}=	${SH}
 PKG_HOME.${GITEA_USER}=		${VARBASE}/db/gitea
 
-SUBST_CLASSES+=			fix-version fix-var
+SUBST_CLASSES+=			fix-version
 SUBST_STAGE.fix-version=	pre-configure
 SUBST_MESSAGE.fix-version=	Fix the version number.
 SUBST_FILES.fix-version=	${WRKSRC}/main.go
 SUBST_SED.fix-version=		-E 's\#^(var Version = )"[^"]+"\#\1"${PKGVERSION}"\#'
 
+SUBST_CLASSES+=		fix-var
 SUBST_STAGE.fix-var=	pre-configure
 SUBST_MESSAGE.fix-var=	Replace some vars
 SUBST_FILES.fix-var=	${WRKDIR}/app.ini.sample
@@ -56,16 +59,14 @@ SUBST_VARS.fix-var=	VARBASE GITEA_USER
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/conf
 
-CONF_FILES+= ${EGDIR}/app.ini.sample ${PKG_SYSCONFDIR}/conf/app.ini
+CONF_FILES+=	${EGDIR}/app.ini.sample ${PKG_SYSCONFDIR}/conf/app.ini
 
 .include "../../mk/bsd.prefs.mk"
 
-#.if ${INIT_SYSTEM} == "smf"
 FILES_SUBST+=	GITEA_USER=${GITEA_USER}
 FILES_SUBST+=	GITEA_GROUP=${GITEA_GROUP}
 FILES_SUBST+=	GITEA_USER_HOME=${VARBASE}/db/gitea
 FILES_SUBST+=	GITEA_SHARE_DIR=${PREFIX}/share/gitea
-#.endif
 
 pre-patch:
 	${CP} ${FILESDIR}/app.ini.sample ${WRKDIR}/


Home | Main Index | Thread Index | Old Index