Index: head/sysutils/gkrellm2/Makefile =================================================================== --- head/sysutils/gkrellm2/Makefile (revision 421543) +++ head/sysutils/gkrellm2/Makefile (revision 421544) @@ -1,84 +1,84 @@ # $FreeBSD$ PORTNAME= gkrellm -PORTVERSION= 2.3.7 +PORTVERSION= 2.3.8 #PORTREVISION= 0 CATEGORIES= sysutils ipv6 MASTER_SITES= http://gkrellm.srcbox.net/releases/ \ LOCAL/ume PKGNAMESUFFIX= 2 MAINTAINER= ume@FreeBSD.org COMMENT= GTK based system monitor LICENSE= GPLv3 USES= gmake pkgconfig tar:bzip2 USE_RC_SUBR= gkrellmd WANT_GNOME= yes OPTIONS_DEFINE= DOCS CLIENT NLS NTLM OPENSSL OPTIONS_DEFAULT= CLIENT NTLM OPENSSL OPTIONS_SUB= yes CLIENT_DESC= GKrellM Client CLIENT_CONFLICTS= gkrellm-[^2].* gkrellm[^2]-[^2].* CLIENT_USE= GNOME=gtk20 XORG=sm,x11 CLIENT_USE_OFF= GNOME=glib20 CLIENT_VARS_OFF= BUILD_WRKSRC=${WRKSRC}/server \ INSTALL_WRKSRC=${WRKSRC}/server NTLM_LIB_DEPENDS= libntlm.so:security/libntlm NTLM_VARS_OFF= MAKE_ENV+=without-ntlm=1 .include .if ${PORT_OPTIONS:MCLIENT} .if ${PORT_OPTIONS:MNLS} USES+= gettext .else MAKE_ENV+= enable_nls=0 .endif .if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes +USES+= ssl MAKE_ENV+= without-gnutls=1 .else MAKE_ENV+= without-gnutls=1 without-ssl=1 .endif .endif PORTDOCS= COPYRIGHT CREDITS README Themes.html ALL_TARGET= freebsd MAKE_ENV+= INSTALLROOT=${PREFIX} INSTALL_PREFIX=${STAGEDIR} \ PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ SINSTALLDIR=${PREFIX}/sbin \ MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \ VERSION=${PORTVERSION} 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\"' post-patch: @${REINPLACE_CMD} -e 's/gthread-2.0/gmodule-2.0 gthread-2.0/g' \ ${WRKSRC}/src/Makefile post-install-CLIENT-on: @${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/gkrellm2/plugins @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/gkrellm2/themes post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \ ${STAGEDIR}${EXAMPLESDIR}/gkrellmd.conf post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/sysutils/gkrellm2/distinfo =================================================================== --- head/sysutils/gkrellm2/distinfo (revision 421543) +++ head/sysutils/gkrellm2/distinfo (revision 421544) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465143229 -SHA256 (gkrellm-2.3.7.tar.bz2) = f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d -SIZE (gkrellm-2.3.7.tar.bz2) = 777841 +TIMESTAMP = 1473295543 +SHA256 (gkrellm-2.3.8.tar.bz2) = 8064ec03ac151c22d716e08d09851102e9deeb2156a265d97f5cf7ad547fa9e3 +SIZE (gkrellm-2.3.8.tar.bz2) = 659164 Index: head/sysutils/gkrellm2/files/patch-Makefile =================================================================== --- head/sysutils/gkrellm2/files/patch-Makefile (revision 421543) +++ head/sysutils/gkrellm2/files/patch-Makefile (revision 421544) @@ -1,42 +1,33 @@ ---- Makefile.orig 2016-06-03 16:29:10 UTC +--- Makefile.orig 2016-09-05 18:22:42 UTC +++ Makefile @@ -3,7 +3,9 @@ # make # For FreeBSD 2.X: # make freebsd2 -# For FreeBSD 3.X or later: +# For FreeBSD 3.X and 4.X: +# make freebsd3 +# For FreeBSD 5.X or later: # make freebsd # For NetBSD 1.5 - 1.6.X # make netbsd1 @@ -118,7 +120,7 @@ export INSTALLDIR SINSTALLDIR INCLUDEDIR export MANDIR SMANDIR MANDIRMODE MANMODE export OS_RELEASE -enable_nls=1 +enable_nls?=1 debug=0 export enable_nls export debug -@@ -131,7 +133,7 @@ all gkrellm: gkrellm.pc - (cd server && ${MAKE} gkrellmd) - - gkrellm.pc: Makefile -- echo 'prefix=$(INSTALLROOT)\n'\ -+ printf 'prefix=$(INSTALLROOT)\n'\ - 'Name: GKrellM\n'\ - 'Description: Extensible GTK system monitoring application\n'\ - 'Version: $(VERSION)\n'\ @@ -151,8 +153,8 @@ uninstall: rm -f $(PKGCONFIGDIR)/gkrellm.pc install_gkrellm.pc: gkrellm.pc - $(INSTALL) -d $(PKGCONFIGDIR) - $(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR) + $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) + $(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(DESTDIR)$(PKGCONFIGDIR) install_darwin install_darwin9 install_macosx: install_gkrellm.pc (cd po && ${MAKE} install)