diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gkrellm2/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/gkrellm2/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/gkrellm2/files/patch-Makefile | 52 | ||||
| -rw-r--r-- | sysutils/gkrellm2/pkg-plist | 1 |
4 files changed, 47 insertions, 15 deletions
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 5fdaf9ce4a19..8ea0e64cac39 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gkrellm -PORTVERSION= 2.1.9 +PORTVERSION= 2.1.12 #PORTREVISION= 0 CATEGORIES= sysutils ipv6 MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \ @@ -49,9 +49,8 @@ ALL_TARGET= freebsd .endif INSTALL_TARGET= install_netbsd -MAKE_ENV+= LOCALEDIR=${X11BASE}/share/locale \ - INCLUDEDIR=${X11BASE}/include \ - INSTALLDIR=${X11BASE}/bin SINSTALLDIR=${PREFIX}/sbin \ +MAKE_ENV+= INSTALLROOT=${X11BASE} SINSTALLDIR=${PREFIX}/sbin \ + PKGCONFIGDIR=${X11BASE}/libdata/pkgconfig \ MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 .if defined(GKRELLM_SERVER_ONLY) MAKE_ENV+= glib12=1 diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo index e3343a1aa29e..5f4e2827af46 100644 --- a/sysutils/gkrellm2/distinfo +++ b/sysutils/gkrellm2/distinfo @@ -1 +1 @@ -MD5 (gkrellm-2.1.9.tar.bz2) = 8936e43c37fd02b6828ab7fa35f426e3 +MD5 (gkrellm-2.1.12.tar.bz2) = 8f4be50970c525d68451bb998a7845d9 diff --git a/sysutils/gkrellm2/files/patch-Makefile b/sysutils/gkrellm2/files/patch-Makefile index a8821370b6f6..4f631bdbeb67 100644 --- a/sysutils/gkrellm2/files/patch-Makefile +++ b/sysutils/gkrellm2/files/patch-Makefile @@ -1,23 +1,55 @@ Index: Makefile diff -u Makefile.orig Makefile ---- Makefile.orig Fri Aug 2 11:56:08 2002 -+++ Makefile Fri Aug 30 01:12:10 2002 -@@ -74,13 +74,13 @@ - #GTOP_LIBS_D = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps +--- Makefile.orig Tue Jun 3 12:48:29 2003 ++++ Makefile Tue Jun 3 22:58:59 2003 +@@ -75,18 +75,18 @@ #export GTOP_INCLUDE GTOP_LIBS GTOP_LIBS_D --INSTALLDIR = /usr/local/bin + VERSION = 2.1.12 +-INSTALLROOT = /usr/local ++INSTALLROOT ?= /usr/local + INSTALLDIR = $(INSTALLROOT)/bin -SINSTALLDIR = $(INSTALLDIR) --MANDIR = /usr/local/share/man/man1 +-MANDIR = $(INSTALLROOT)/share/man/man1 -SMANDIR = $(MANDIR) -+INSTALLDIR ?= /usr/local/bin +SINSTALLDIR ?= $(INSTALLDIR) -+MANDIR ?= /usr/local/share/man/man1 ++MANDIR ?= $(INSTALLROOT)/share/man/man1 +SMANDIR ?= $(MANDIR) MANMODE = 644 MANDIRMODE = 755 --INCLUDEDIR = /usr/local/include -+INCLUDEDIR ?= /usr/local/include + INCLUDEDIR = $(INSTALLROOT)/include INCLUDEMODE = 644 INCLUDEDIRMODE = 755 + INSTALL ?= install +-PKGCONFIGDIR = $(INSTALLROOT)/lib/pkgconfig ++PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig + LOCALEDIR ?= $(INSTALLROOT)/share/locale + OS_NAME=$(shell uname -s) +@@ -132,6 +132,9 @@ + (cd src && ${MAKE} install_netbsd) + (cd server && ${MAKE} install_netbsd) + ++ $(INSTALL) -d $(PKGCONFIGDIR) ++ $(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR) ++ + install_openbsd: + (cd po && ${MAKE} install) + (cd src && ${MAKE} install_openbsd) +@@ -147,14 +150,14 @@ + (cd src && ${MAKE} clean) + (cd server && ${MAKE} clean) + +-freebsd2: ++freebsd2: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm ) + (cd server && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd ) + +-freebsd3 freebsd4 freebsd5 freebsd: ++freebsd3 freebsd4 freebsd5 freebsd: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm ) diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index ace303d1b48c..f2864604661c 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -13,6 +13,7 @@ etc/rc.d/gkrellmd.sh.sample %%CLIENT%%bin/gkrellm %%CLIENT%%include/gkrellm2/gkrellm.h %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h +%%CLIENT%%libdata/pkgconfig/gkrellm.pc %%CLIENT%%share/locale/cs/LC_MESSAGES/gkrellm.mo %%CLIENT%%share/locale/de/LC_MESSAGES/gkrellm.mo %%CLIENT%%share/locale/es/LC_MESSAGES/gkrellm.mo |