diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /sysutils/gkrellm2 | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'sysutils/gkrellm2')
| -rw-r--r-- | sysutils/gkrellm2/Makefile | 20 | ||||
| -rw-r--r-- | sysutils/gkrellm2/pkg-plist | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index e8e60c0e7cc5..fd0084ce8131 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gkrellm PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils ipv6 MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \ ${MASTER_SITE_LOCAL} @@ -43,7 +43,7 @@ MAKE_ENV+= enable_nls=0 .else USE_GETTEXT= yes .endif -USE_XLIB= yes +USE_XORG= x11 sm .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls-openssl.26:${PORTSDIR}/security/gnutls MAKE_ENV+= GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \ @@ -77,8 +77,6 @@ MAN8= gkrellmd.8 PORTDOCS= COPYRIGHT CREDITS README Themes.html .endif -MAN1PREFIX= ${X11BASE} - .include <bsd.port.pre.mk> ALL_TARGET= freebsd @@ -86,15 +84,15 @@ ALL_TARGET= freebsd INSTALL_TARGET= install_freebsd .endif -MAKE_ENV+= CC="${CC}" INSTALLROOT=${X11BASE} INSTALLDIR=${X11BASE}/bin \ - PKGCONFIGDIR=${X11BASE}/libdata/pkgconfig \ +MAKE_ENV+= CC="${CC}" INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \ + PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \ SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \ SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \ VERSION=${PORTVERSION} -CFLAGS+= -DSYSTEM_THEMES_DIR='\"${X11BASE}/share/gkrellm2/themes\"' \ - -DSYSTEM_PLUGINS_DIR='\"${X11BASE}/libexec/gkrellm2/plugins\"' \ +CFLAGS+= -DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \ + -DSYSTEM_PLUGINS_DIR='\"${LOCALBASE}/libexec/gkrellm2/plugins\"' \ -DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \ -DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"' @@ -113,11 +111,11 @@ post-patch: post-install: .if !defined(GKRELLM_SERVER_ONLY) - @${MKDIR} ${X11BASE}/libexec/gkrellm2/plugins - @${MKDIR} ${X11BASE}/share/gkrellm2/themes + @${MKDIR} ${LOCALBASE}/libexec/gkrellm2/plugins + @${MKDIR} ${LOCALBASE}/share/gkrellm2/themes @${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1 .if ${OSVERSION} < 500000 - @${CHMOD} 2511 ${X11BASE}/bin/gkrellm + @${CHMOD} 2511 ${LOCALBASE}/bin/gkrellm .endif .endif .if ${OSVERSION} < 500000 diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index 430ca8c99061..a00beb4f0f37 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -9,7 +9,6 @@ sbin/gkrellmd %%EXAMPLESDIR%%/gkrellmd.conf @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf @dirrm %%EXAMPLESDIR%% -@cwd %%X11BASE%% %%CLIENT%%include/gkrellm2/gkrellm.h %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h %%CLIENT%%@dirrm include/gkrellm2 @@ -37,4 +36,3 @@ sbin/gkrellmd %%CLIENT%%@dirrmtry libexec/gkrellm2 %%CLIENT%%@dirrmtry share/gkrellm2/themes %%CLIENT%%@dirrmtry share/gkrellm2 -@cwd %%PREFIX%% |