pkgsrc-Changes archive

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

CVS commit: pkgsrc/www/pup



Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Feb 16 12:21:28 UTC 2018

Modified Files:
        pkgsrc/www/pup: Makefile

Log Message:
pup: Use lang/go/go-package.mk (NFCI)

Instead of (re)defining logic to build packages with Go in
`post-extract' and `do-build' directly use lang/go/go-package.mk
and adjust `do-install' target accordingly.

Discussed with <fhajny>.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/pup/Makefile

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

Modified files:

Index: pkgsrc/www/pup/Makefile
diff -u pkgsrc/www/pup/Makefile:1.4 pkgsrc/www/pup/Makefile:1.5
--- pkgsrc/www/pup/Makefile:1.4 Mon May  8 10:25:29 2017
+++ pkgsrc/www/pup/Makefile     Fri Feb 16 12:21:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/05/08 10:25:29 leot Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/16 12:21:28 leot Exp $
 
 DISTNAME=              pup-0.4.0
 PKGREVISION=           2
@@ -11,24 +11,14 @@ HOMEPAGE=           https://github.com/ericchiang
 COMMENT=               Parsing HTML at the command line
 LICENSE=               mit
 
-WRKSRC=                        ${WRKDIR}/src/github.com/ericchiang/pup
+GO_DIST_BASE=          ${DISTNAME}
+GO_SRCPATH=            github.com/ericchiang/pup
 
-.include "../../lang/go/version.mk"
-
-BUILD_DEPENDS+=                go-${GO_VERSION}*:../../lang/go
-
-MAKE_ENV+=             GOPATH=${WRKDIR}:${PREFIX}/gopkg
 INSTALLATION_DIRS+=    bin share/doc/pup
 
-post-extract:
-       ${MKDIR} ${WRKSRC}
-       ${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC}
-
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} go build -o bin/pup
-
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/bin/pup ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKDIR}/bin/pup ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/pup
 
+.include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index