Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/gkrellm/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.84 2015/08/23 14:30:42 wiz Exp $
# $NetBSD: Makefile,v 1.87 2016/09/19 13:04:28 wiz Exp $
.include "Makefile.common"
PKGREVISION= 25
PKGREVISION= 28
GKRELLM_PKGBASE= gkrellm
WRKSRC= ${GKRELLM_SRCDIR}

4
sysutils/gkrellm/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.39 2015/04/25 14:24:51 tnn Exp $
# $NetBSD: buildlink3.mk,v 1.41 2016/08/03 10:22:18 adam Exp $
BUILDLINK_TREE+= gkrellm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gkrellm
GKRELLM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.1.22
BUILDLINK_ABI_DEPENDS.gkrellm+= gkrellm>=2.2.10nb24
BUILDLINK_ABI_DEPENDS.gkrellm+= gkrellm>=2.2.10nb27
BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
.include "../../devel/glib2/buildlink3.mk"

5
sysutils/gkrellm/distinfo
View File

@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.42 2013/02/26 16:16:08 jperkin Exp $
$NetBSD: distinfo,v 1.45 2016/09/17 14:28:59 richard Exp $
SHA1 (gkrellm-2.2.10.tar.bz2) = 329d0ba5600998f21b75491937c3c2924ab6ed40
RMD160 (gkrellm-2.2.10.tar.bz2) = 6694838015716c09291887ae598daceb4f4b440f
SHA512 (gkrellm-2.2.10.tar.bz2) = f3bc055c54bd18c20a59fae471e27c7f4067067525cbc351a0e9fb80a70f7da59c220f36ecabae341e73e0b0e93546edabebff896eed863b515c6d8408a5670a
Size (gkrellm-2.2.10.tar.bz2) = 718894 bytes
SHA1 (patch-Makefile.inc) = b3c86f4f299386c5a59f2e22191c29b80254833d
SHA1 (patch-Makefile.inc) = 958f3f402b3f13c2d81520eda62fe4293ac784ab
SHA1 (patch-aa) = 1cf9b98520b37aa75c6c5b9d0398e8d92204a12e
SHA1 (patch-ab) = e900c811ddea106efee5cbfc04d0cf14cc6e6451
SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75

29
sysutils/gkrellm/patches/patch-Makefile.inc
View File

@@ -1,10 +1,22 @@
$NetBSD: patch-Makefile.inc,v 1.2 2013/02/26 16:16:09 jperkin Exp $
$NetBSD: patch-Makefile.inc,v 1.4 2016/09/17 14:28:59 richard Exp $
Match OPSYS with what pkgsrc uses.
Add an explicit -lm and -lgmodule-2.0 for Solaris.
And -lX11, -lm and -lgmodule-2.0 for Linux
--- Makefile.inc.orig 2013-02-26 15:55:55.253179839 +0000
--- Makefile.inc.orig 2016-09-17 12:12:43.663376387 +0000
+++ Makefile.inc
@@ -8,8 +8,8 @@ INSTALLDIR?= $(INSTALLROOT)/bin
INCLUDEDIR?= $(INSTALLROOT)/include
LOCALEDIR?= $(INSTALLROOT)/share/locale
PKGCONFIGDIR?= $(INSTALLROOT)/lib/pkgconfig
-MANDIR?= $(INSTALLROOT)/man/man1
-SMANDIR?= $(INSTALLROOT)/man/man1
+MANDIR?= $(INSTALLROOT)/$(PKGMANDIR)/man1
+SMANDIR?= $(INSTALLROOT)/$(PKGMANDIR)/man1
SINSTALLDIR?= $(INSTALLROOT)/bin
# Ownership and mode options
@@ -66,7 +66,7 @@ endif
ifeq ($(GTOP),)
@@ -37,3 +49,16 @@ Add an explicit -lm and -lgmodule-2.0 for Solaris.
else
SYS_LIBS+= -lnsl
endif
@@ -134,6 +134,12 @@ BINGROUP= kmem
NEED_MD5= no
MD5_LIBS= -lmd
SYS_LIBS= -lkvm -lkinfo -ldevstat -lX11 -lm -lgmodule-2.0
+ else
+ ifeq (${OPSYS},Linux)
+ ifeq ($(MODULE),src)
+SYS_LIBS+= -lX11 -lm -lgmodule-2.0
+ endif
+ endif
endif
endif
endif