Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jan 2020 16:29:14 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523249 - head/sysutils/catfish
Message-ID:  <202001161629.00GGTEKl057947@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Thu Jan 16 16:29:13 2020
New Revision: 523249
URL: https://svnweb.freebsd.org/changeset/ports/523249

Log:
  - Fix build after the manpage handling changes in r523104
  - Disable the ZEITGEIST option by default and add "broken" to the
    comment.
  
  The zeitgeist port only provides python 2 libraries. If catfish is
  compiled with the ZEITGEIST option on, it compiles and runs fine,
  but the zeitgeist support is not present anyway.
  
  Reported by:	Marko Cupać <marko.cupac@mimar.rs>

Modified:
  head/sysutils/catfish/Makefile
  head/sysutils/catfish/pkg-plist

Modified: head/sysutils/catfish/Makefile
==============================================================================
--- head/sysutils/catfish/Makefile	Thu Jan 16 16:12:21 2020	(r523248)
+++ head/sysutils/catfish/Makefile	Thu Jan 16 16:29:13 2020	(r523249)
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	DOCS ZEITGEIST
-OPTIONS_DEFAULT=ZEITGEIST POLKIT
+OPTIONS_DEFAULT=POLKIT
 OPTIONS_MULTI=	PRIVILEGES
 OPTIONS_MULTI_PRIVILEGES=	POLKIT SUDO
 
@@ -38,13 +38,8 @@ POLKIT_RUN_DEPENDS=	pkexec:sysutils/polkit
 SUDO_DESC=	Provide sudo support
 SUDO_RUN_DEPENDS=	sudo:security/sudo
 
-ZEITGEIST_DESC=	Provide recent search suggestions
+ZEITGEIST_DESC=	Provide recent search suggestions (broken)
 ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
-
-post-install:
-	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/catfish.1 ${STAGEDIR}${PREFIX}/man/man1/catfish.1
-	(cd ${STAGEDIR}${PREFIX}/share && ${RMDIR} -p man/man1)
-	${GZIP} ${STAGEDIR}${PREFIX}/man/man1/catfish.1
 
 .include <bsd.port.pre.mk>
 

Modified: head/sysutils/catfish/pkg-plist
==============================================================================
--- head/sysutils/catfish/pkg-plist	Thu Jan 16 16:12:21 2020	(r523248)
+++ head/sysutils/catfish/pkg-plist	Thu Jan 16 16:29:13 2020	(r523249)
@@ -1,5 +1,5 @@
 bin/catfish
-man/man1/catfish.1.gz
+share/man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001161629.00GGTEKl057947>