Date: Thu, 12 Nov 2015 11:10:28 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401322 - in head/sysutils/gkrellm2: . files Message-ID: <201511121110.tACBASNm090825@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Thu Nov 12 11:10:28 2015 New Revision: 401322 URL: https://svnweb.freebsd.org/changeset/ports/401322 Log: - Use OPTIONS helper. - Use @sample. - Re-generate patches to make portlint happy. Modified: head/sysutils/gkrellm2/Makefile head/sysutils/gkrellm2/files/patch-Makefile head/sysutils/gkrellm2/files/patch-gkrellm.1 head/sysutils/gkrellm2/files/patch-gkrellmd.1 head/sysutils/gkrellm2/files/patch-server__Makefile head/sysutils/gkrellm2/files/patch-server__gkrellmd.h head/sysutils/gkrellm2/files/patch-src__Makefile head/sysutils/gkrellm2/files/patch-src__configure head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c head/sysutils/gkrellm2/pkg-plist Modified: head/sysutils/gkrellm2/Makefile ============================================================================== --- head/sysutils/gkrellm2/Makefile Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/Makefile Thu Nov 12 11:10:28 2015 (r401322) @@ -17,23 +17,29 @@ USES= gmake pkgconfig tar:bzip2 USE_RC_SUBR= gkrellmd WANT_GNOME= yes -OPTIONS_DEFINE= DOCS GKRELLM_CLIENT NLS NTLM +OPTIONS_DEFINE= DOCS CLIENT NLS NTLM OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL -OPTIONS_DEFAULT= GKRELLM_CLIENT NTLM OPENSSL -GKRELLM_CLIENT_DESC= GKrellM Client +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:${PORTSDIR}/security/libntlm +NTLM_VARS_OFF= MAKE_ENV+=without-ntlm=1 .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MGKRELLM_CLIENT} -CONFLICTS= gkrellm-[^2].* gkrellm[^2]-[^2].* -USE_GNOME= gtk20 +.if ${PORT_OPTIONS:MCLIENT} .if ${PORT_OPTIONS:MNLS} USES+= gettext .else MAKE_ENV+= enable_nls=0 .endif -USE_XORG= x11 sm .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls MAKE_ENV+= GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \ @@ -44,33 +50,9 @@ MAKE_ENV+= without-gnutls=1 .else MAKE_ENV+= without-gnutls=1 without-ssl=1 .endif -.else -BUILD_WRKSRC= ${WRKSRC}/server -INSTALL_WRKSRC= ${WRKSRC}/server -USE_GNOME= glib20 -.endif - -.if ${PORT_OPTIONS:MNTLM} -LIB_DEPENDS+= libntlm.so:${PORTSDIR}/security/libntlm -.else -MAKE_ENV+= without-ntlm=1 -.endif - -PLIST_SUB= PREFIX=${PREFIX} -.if ${PORT_OPTIONS:MGKRELLM_CLIENT} -PLIST_SUB+= CLIENT="" -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif -.else -PLIST_SUB+= CLIENT="@comment " NLS="@comment " .endif -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= COPYRIGHT CREDITS README Themes.html -.endif ALL_TARGET= freebsd @@ -89,20 +71,20 @@ post-patch: @${REINPLACE_CMD} -e 's/gthread-2.0/gmodule-2.0 gthread-2.0/g' \ ${WRKSRC}/src/Makefile -post-install: -.if ${PORT_OPTIONS:MGKRELLM_CLIENT} +post-install-CLIENT-on: @${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/gkrellm2/plugins @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/gkrellm2/themes -.endif + +post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \ ${STAGEDIR}${EXAMPLESDIR}/gkrellmd.conf -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/sysutils/gkrellm2/files/patch-Makefile ============================================================================== --- head/sysutils/gkrellm2/files/patch-Makefile Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-Makefile Thu Nov 12 11:10:28 2015 (r401322) @@ -1,7 +1,5 @@ -Index: Makefile -diff -u Makefile.orig Makefile ---- Makefile.orig 2010-10-03 01:21:01.000000000 +0900 -+++ Makefile 2014-06-18 01:31:33.764515607 +0900 +--- Makefile.orig 2010-10-02 16:21:01 UTC ++++ Makefile @@ -3,7 +3,9 @@ # make # For FreeBSD 2.X: Modified: head/sysutils/gkrellm2/files/patch-gkrellm.1 ============================================================================== --- head/sysutils/gkrellm2/files/patch-gkrellm.1 Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-gkrellm.1 Thu Nov 12 11:10:28 2015 (r401322) @@ -1,14 +1,12 @@ -Index: gkrellm.1 -diff -u gkrellm.1.orig gkrellm.1 ---- gkrellm.1.orig Mon Oct 13 13:01:37 2003 -+++ gkrellm.1 Mon Oct 13 15:24:10 2003 +--- gkrellm.1.orig 2010-10-05 16:21:55 UTC ++++ gkrellm.1 @@ -1,4 +1,4 @@ --.TH gkrellm 1 "June 7, 2003" "GNU/Linux" "User's Manual" +-.TH gkrellm 1 "Sep 15, 2010" "GNU/Linux" "User's Manual" +.TH gkrellm 1 "June 7, 2003" "FreeBSD" "User's Manual" .SH "NAME" gkrellm \- The GNU Krell Monitors -@@ -416,7 +416,7 @@ +@@ -429,7 +429,7 @@ ppp is connecting, and the on state is the ppp link connected. The phone line lock is determined by the existence of the modem lock file @@ -17,7 +15,7 @@ diff -u gkrellm.1.orig gkrellm.1 which assumes pppd is using .IR /dev/modem. However, if your pppd setup does not use -@@ -425,11 +425,11 @@ +@@ -438,11 +438,11 @@ .PP .RS .nf @@ -31,7 +29,7 @@ diff -u gkrellm.1.orig gkrellm.1 state is detected by the existence of .IR /var/run/pppX.pid and the time stamp of this file is the base for the on line time. -@@ -1007,7 +1007,7 @@ +@@ -1138,7 +1138,7 @@ .nf ~/.gkrellm2/themes /usr/local/share/gkrellm2/themes @@ -40,7 +38,7 @@ diff -u gkrellm.1.orig gkrellm.1 .fi .RE .PP -@@ -1018,7 +1018,7 @@ +@@ -1149,7 +1149,7 @@ .RS .nf ~/.themes/THEME_NAME/gkrellm2 @@ -49,7 +47,7 @@ diff -u gkrellm.1.orig gkrellm.1 .fi .RE .PP -@@ -1046,7 +1046,7 @@ +@@ -1177,7 +1177,7 @@ The directories .IR /usr/local/lib/gkrellm2/plugins and @@ -58,7 +56,7 @@ diff -u gkrellm.1.orig gkrellm.1 are also searched for plugins to install. .PP Some plugins may be available only as source files and they will -@@ -1082,7 +1082,7 @@ +@@ -1213,7 +1213,7 @@ .I ~/.gkrellm2/plugins User plugin directory. .TP @@ -67,7 +65,7 @@ diff -u gkrellm.1.orig gkrellm.1 System wide plugin directory. .TP .I /usr/local/lib/gkrellm2/plugins -@@ -1094,13 +1094,13 @@ +@@ -1225,13 +1225,13 @@ .I ~/.themes/THEME_NAME/gkrellm2 User theme packaged as part of a user Gtk theme. .TP Modified: head/sysutils/gkrellm2/files/patch-gkrellmd.1 ============================================================================== --- head/sysutils/gkrellm2/files/patch-gkrellmd.1 Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-gkrellmd.1 Thu Nov 12 11:10:28 2015 (r401322) @@ -1,14 +1,12 @@ -Index: gkrellmd.1 -diff -u gkrellmd.1.orig gkrellmd.1 ---- gkrellmd.1.orig Mon Apr 12 12:01:47 2004 -+++ gkrellmd.1 Tue Apr 13 17:14:02 2004 +--- gkrellmd.1.orig 2010-09-14 16:55:49 UTC ++++ gkrellmd.1 @@ -1,4 +1,4 @@ --.TH gkrellmd 1 "June 7, 2003" "GNU/Linux" "User's Manual" +-.TH gkrellmd 1 "Sep 15, 2010" "GNU/Linux" "User's Manual" +.TH gkrellmd 8 "June 7, 2003" "FreeBSD" "User's Manual" .SH "NAME" gkrellmd \- The GNU Krell Monitors Server -@@ -242,7 +242,7 @@ +@@ -375,7 +375,7 @@ .SH "FILES" .TP @@ -17,7 +15,7 @@ diff -u gkrellmd.1.orig gkrellmd.1 System server config which is read first. The config file may contain lines similar to the command line args. For example: -@@ -281,16 +281,13 @@ +@@ -414,16 +414,13 @@ .RE .TP Modified: head/sysutils/gkrellm2/files/patch-server__Makefile ============================================================================== --- head/sysutils/gkrellm2/files/patch-server__Makefile Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-server__Makefile Thu Nov 12 11:10:28 2015 (r401322) @@ -1,7 +1,5 @@ -Index: server/Makefile -diff -u server/Makefile.orig server/Makefile ---- server/Makefile.orig 2010-10-03 01:21:01.000000000 +0900 -+++ server/Makefile 2014-06-18 01:15:19.903510437 +0900 +--- server/Makefile.orig 2010-10-02 16:21:01 UTC ++++ server/Makefile @@ -26,6 +26,7 @@ MANMODE ?= 644 MANDIRMODE ?= 755 Modified: head/sysutils/gkrellm2/files/patch-server__gkrellmd.h ============================================================================== --- head/sysutils/gkrellm2/files/patch-server__gkrellmd.h Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-server__gkrellmd.h Thu Nov 12 11:10:28 2015 (r401322) @@ -1,8 +1,6 @@ -Index: server/gkrellmd.h -diff -u server/gkrellmd.h.orig server/gkrellmd.h ---- server/gkrellmd.h.orig 2008-10-04 06:52:48.000000000 +0900 -+++ server/gkrellmd.h 2008-10-04 19:55:03.000000000 +0900 -@@ -118,8 +118,12 @@ +--- server/gkrellmd.h.orig 2010-09-14 16:34:34 UTC ++++ server/gkrellmd.h +@@ -131,8 +131,12 @@ #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR) #define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd" #endif Modified: head/sysutils/gkrellm2/files/patch-src__Makefile ============================================================================== --- head/sysutils/gkrellm2/files/patch-src__Makefile Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-src__Makefile Thu Nov 12 11:10:28 2015 (r401322) @@ -1,7 +1,5 @@ -Index: src/Makefile -diff -u src/Makefile.orig src/Makefile ---- src/Makefile.orig 2010-10-03 01:21:01.000000000 +0900 -+++ src/Makefile 2014-06-18 01:12:52.297511351 +0900 +--- src/Makefile.orig 2010-10-02 16:21:01 UTC ++++ src/Makefile @@ -53,7 +53,8 @@ CONFIGURE_ARGS += --without-ntlm endif @@ -12,7 +10,7 @@ diff -u src/Makefile.orig src/Makefile # pull in variables set by configure script include configure.mk -@@ -71,7 +72,7 @@ +@@ -68,7 +69,7 @@ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` Modified: head/sysutils/gkrellm2/files/patch-src__configure ============================================================================== --- head/sysutils/gkrellm2/files/patch-src__configure Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-src__configure Thu Nov 12 11:10:28 2015 (r401322) @@ -1,7 +1,5 @@ -Index: src/configure -diff -u src/configure.orig src/configure ---- src/configure.orig 2010-09-14 23:40:38.000000000 +0900 -+++ src/configure 2010-10-06 17:48:28.286565914 +0900 +--- src/configure.orig 2010-09-14 14:40:38 UTC ++++ src/configure @@ -46,8 +46,8 @@ echo -n "Checking for OpenSSL... " echo "Checking for OpenSSL... " 1>& 5 Modified: head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c ============================================================================== --- head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c Thu Nov 12 11:10:28 2015 (r401322) @@ -1,7 +1,5 @@ -Index: src/sysdeps/bsd-common.c -diff -u -p src/sysdeps/bsd-common.c.orig src/sysdeps/bsd-common.c ---- src/sysdeps/bsd-common.c.orig 2010-09-15 01:27:35.000000000 +0900 -+++ src/sysdeps/bsd-common.c 2011-05-04 02:20:07.328745551 +0900 +--- src/sysdeps/bsd-common.c.orig 2010-09-14 16:27:35 UTC ++++ src/sysdeps/bsd-common.c @@ -64,6 +64,10 @@ gkrellm_sys_net_read_data(void) { if (ifa->ifa_addr->sa_family != AF_LINK) Modified: head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c ============================================================================== --- head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c Thu Nov 12 11:10:28 2015 (r401322) @@ -1,7 +1,5 @@ -Index: src/sysdeps/freebsd.c -diff -u -p src/sysdeps/freebsd.c.orig src/sysdeps/freebsd.c ---- src/sysdeps/freebsd.c.orig 2010-10-07 23:29:35.000000000 +0900 -+++ src/sysdeps/freebsd.c 2015-04-30 04:11:17.549088591 +0900 +--- src/sysdeps/freebsd.c.orig 2010-10-07 14:29:35 UTC ++++ src/sysdeps/freebsd.c @@ -1441,7 +1441,9 @@ get_data(int iodev, u_char command, int struct smbcmd cmd; Modified: head/sysutils/gkrellm2/pkg-plist ============================================================================== --- head/sysutils/gkrellm2/pkg-plist Thu Nov 12 09:46:29 2015 (r401321) +++ head/sysutils/gkrellm2/pkg-plist Thu Nov 12 11:10:28 2015 (r401322) @@ -8,23 +8,21 @@ libdata/pkgconfig/gkrellmd.pc %%CLIENT%%man/man1/gkrellm.1.gz man/man8/gkrellmd.8.gz sbin/gkrellmd -@unexec if cmp -s %D/etc/gkrellmd.conf %D/%%EXAMPLESDIR%%/gkrellmd.conf; then rm -f %D/etc/gkrellmd.conf; fi -%%EXAMPLESDIR%%/gkrellmd.conf -@exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf -%%NLS%%share/locale/bg/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/cs/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/da/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/de/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/es/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/fr/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/it/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/ja/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/nl/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/pl/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/ru/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo -%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo +@sample %%EXAMPLESDIR%%/gkrellmd.conf etc/gkrellmd.conf +%%CLIENT%%%%NLS%%share/locale/bg/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/cs/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/de/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/es/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/fr/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/it/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/ja/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/nl/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/pl/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/ru/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo +%%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo %%CLIENT%%@dir libexec/gkrellm2/plugins @dir libexec/gkrellm2/plugins-gkrellmd %%CLIENT%%@dir %%DATADIR%%2/themes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511121110.tACBASNm090825>