pkgsrc-WIP-changes archive

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

update mtr-graph to git:28f0506



Module Name:	pkgsrc-wip
Committed By:	vsyakovetsky <vsyakovetsky%gmail.com@localhost>
Pushed By:	vsyakovetsky
Date:		Thu Jan 5 15:01:38 2017 +0200
Changeset:	403fbe6f50dff61dfdda5e2d18cd23cc2ddc9983

Modified Files:
	mtr-graph/Makefile
	mtr-graph/distinfo
	mtr-graph/options.mk

Log Message:
update mtr-graph to git:28f0506

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

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

diffstat:
 mtr-graph/Makefile   | 29 +++++++----------------------
 mtr-graph/distinfo   |  8 ++++----
 mtr-graph/options.mk | 10 ++++------
 3 files changed, 15 insertions(+), 32 deletions(-)

diffs:
diff --git a/mtr-graph/Makefile b/mtr-graph/Makefile
index 690051a..1b7adb7 100644
--- a/mtr-graph/Makefile
+++ b/mtr-graph/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2015/04/01 13:14:20 yvs4sf Exp $
+# $NetBSD$
 
 CATEGORIES=	net
 PKGBASE=	mtr
 PKGVERSION=	0.85.99
-PKGREVISION=	8
+PKGREVISION=	10
 PKGNAME=	${PKGBASE}-graph-${PKGVERSION}
-DISTNAME=	${PKGBASE}-${GITVERSION}
-MASTER_SITES=	https://github.com/${GITHUB_USER}/${PKGBASE}/tarball/${GITVERSION}/
-WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PKGBASE}-${GITVERSION}
+DISTNAME=	${PKGBASE}-${GITHUB_HASH}
+MASTER_SITES=	https://github.com/${GITHUB_USER}/${PKGBASE}/tarball/${GITHUB_HASH}/
+WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PKGBASE}-${GITHUB_HASH}
 
-GITVERSION=	ca79a82
+GITHUB_HASH=	28f0506
 GITHUB_USER=	yvs2014
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -26,23 +26,8 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/mtr
 
 .include "options.mk"
 
-# mtr uses libtermcap by default, but needs wattr_{on,off} from (n)curses,
-# so we rewrite -ltermcap to -lncurses (which will be auto-mangled into
-# -lcurses on the appropriate platforms).
-BUILDLINK_TRANSFORM+=	l:termcap:ncurses
-
 SPECIAL_PERMS=	sbin/mtr ${SETUID_ROOT_PERMS}
 
-# Remove hard-coded compiler option that GCC 3.x doesn't support.
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_TRANSFORM+=	rm:-Wno-pointer-sign
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-??.*-*)
-LIBS+=	-lresolv
-.endif
-
 pre-configure:
 	autoreconf -fi ${WRKSRC}
 
@@ -51,5 +36,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mtr-graph/distinfo b/mtr-graph/distinfo
index 7259d01..c4b01f3 100644
--- a/mtr-graph/distinfo
+++ b/mtr-graph/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2015/04/01 13:14:20 yvs4sf Exp $
+$NetBSD$
 
-Size (mtr-ca79a82.tar.gz) = 103036 bytes
-SHA1 (mtr-ca79a82.tar.gz) = cd0bde4ad5d66888e2d261d4814172816324b0b1
-RMD160 (mtr-ca79a82.tar.gz) = 49aafebc7ca8308acf0c36dcea25cf3ac5ca86cc
+Size (mtr-28f0506.tar.gz) = 111228 bytes
+SHA1 (mtr-28f0506.tar.gz) = 6864c0557438d379bc2cc790f6f1a54b3790243d
+RMD160 (mtr-28f0506.tar.gz) = 7ab2eff0a9105189c15f6006ec0263d59d00d192
diff --git a/mtr-graph/options.mk b/mtr-graph/options.mk
index 2fa6972..4575133 100644
--- a/mtr-graph/options.mk
+++ b/mtr-graph/options.mk
@@ -1,18 +1,16 @@
-# $NetBSD: options.mk,v 1.4 2015/03/06 10:35:31 yvs4sf Exp $
+# $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mtr-graph
 PKG_SUPPORTED_OPTIONS=	gtk
 PKG_SUPPORTED_OPTIONS+=	inet6
 PKG_SUPPORTED_OPTIONS+=	ipinfo
-PKG_OPTIONS_OPTIONAL_GROUPS+=	graphcairo
-PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xcb
-PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xlib
 PKG_SUPPORTED_OPTIONS+=	libidn
 PKG_SUPPORTED_OPTIONS+=	unicode
 PKG_SUPPORTED_OPTIONS+=	sys-getopt
-PKG_SUGGESTED_OPTIONS=	inet6
+PKG_OPTIONS_OPTIONAL_GROUPS+=	graphcairo
+PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xcb
+PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xlib
 PKG_SUGGESTED_OPTIONS+=	ipinfo
-PKG_SUGGESTED_OPTIONS+=	graphcairo-xcb
 PKG_SUGGESTED_OPTIONS+=	unicode
 PKG_SUGGESTED_OPTIONS+=	sys-getopt
 


Home | Main Index | Thread Index | Old Index