pkgsrc-WIP-changes archive

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

fix: pkglint error



Module Name:	pkgsrc-wip
Committed By:	miwarin <miwarin%gmail.com@localhost>
Pushed By:	miwarin
Date:		Sat Jan 27 11:48:08 2018 +0900
Changeset:	de8b73a46169d94130fb49a8feea1de32d52f9c4

Modified Files:
	ioping/Makefile
	ioping/PLIST
	mackerel-agent-plugins/Makefile

Log Message:
fix: pkglint error

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

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

diffstat:
 ioping/Makefile                 | 2 +-
 ioping/PLIST                    | 2 +-
 mackerel-agent-plugins/Makefile | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diffs:
diff --git a/ioping/Makefile b/ioping/Makefile
index 7167f5bfff..930cd61fa1 100644
--- a/ioping/Makefile
+++ b/ioping/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/koct9i/ioping/
 COMMENT=	Monitor I/O latency in real time
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=	${WRKDIR}/${PKGNAME:S/v//}
+WRKSRC=	${WRKDIR}/${PKGNAME_NOREV:S/v//}
 
 USE_TOOLS+=	gmake
 
diff --git a/ioping/PLIST b/ioping/PLIST
index cd82609a06..3cca6245d2 100644
--- a/ioping/PLIST
+++ b/ioping/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD
+@comment $NetBSD$
 bin/ioping
 man/man1/ioping.1
diff --git a/mackerel-agent-plugins/Makefile b/mackerel-agent-plugins/Makefile
index cae127a14d..0f3105440d 100755
--- a/mackerel-agent-plugins/Makefile
+++ b/mackerel-agent-plugins/Makefile
@@ -18,7 +18,9 @@ EXTRACT_DIR=	${WRKDIR}/src/github.com/mackerelio
 USE_TOOLS+=	gmake perl
 BUILD_DEPENDS+=		go-${GO_VERSION}*:../../lang/go
 
-INSTALLATION_DIRS+=	bin share/examples/mackerel-agent
+INSTALLATION_DIRS+=	bin
+
+ARCH=`${UNAME} -m`
 
 pre-extract:
 	cd ${WRKDIR} && ${MKDIR} ${EXTRACT_DIR}
@@ -30,6 +32,6 @@ do-test:
 	cd ${WRKSRC} && GOPATH=${GOPATH} PATH=${PATH}:${GOPATH}/bin ${MAKE_PROGRAM} test
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/build/`uname -s | tr "[:upper:]" "[:lower:]"`/`uname -m`/* ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/build/${LOWER_OPSYS}/${ARCH}/* ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index