sysutils/conky: Update to 1.18.0

freebsd · Feb 18, 2023 · 5ed62a0 · 5ed62a0
1 parent 441e719
commit 5ed62a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	conky
-PORTVERSION=	1.17.0
+PORTVERSION=	1.18.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libinotify.so:devel/libinotify
 BUILD_DEPENDS=	gsed:textproc/gsed
 
 USES=		cpe cmake compiler:c++11-lib gettext-runtime iconv \
-		localbase lua:52-53 pkgconfig tar:bzip2
+		localbase:ldflags lua:52-53 pkgconfig tar:bzip2
 
 CMAKE_ARGS=	-DBUILD_PORT_MONITORS:BOOL=false \
 		-DBUILD_IBM:BOOL=false \
@@ -152,15 +152,6 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src_CMakeLists.txt
 post-patch:
 	@${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \
 		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
-.if ${LUA_DEFAULT} == 5.2
-	# Force using lua 5.2
-	@${REINPLACE_CMD} -e 's/lua.*5\.*3//' \
-		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
-.elif ${LUA_DEFAULT} == 5.3
-	# Force using lua 5.3
-	@${REINPLACE_CMD} -e 's/lua.*5\.*2//' \
-		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
-.endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672604377
-SHA256 (brndnmtthws-conky-v1.17.0_GH0.tar.gz) = c3558bc028bcfc583d8e7775aed20a0f264ff47dbf0debdf70a95b3a180069dc
-SIZE (brndnmtthws-conky-v1.17.0_GH0.tar.gz) = 1699311
+TIMESTAMP = 1676741723
+SHA256 (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 17a131689ac07dbf97b817f310a2f5ecb572f31ff7ca33dd3c14a276f18ab355
+SIZE (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 1703679
diff --git a/sysutils/conky/files/patch-lua_CMakeLists.txt b/sysutils/conky/files/patch-lua_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lua/CMakeLists.txt.orig	2023-02-18 14:34:53 UTC
++++ lua/CMakeLists.txt
+@@ -31,6 +31,8 @@ if(BUILD_X11)
+     get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY)
+     link_directories(${X11_SM_LIB_PATH})
+
++    link_directories(${LIBS})
++
+     # cairo_set_dash() needs this special hack to work properly if you have a
+     # better solution, please let me know
+     wrap_tolua(luacairo_src cairo.pkg libcairo.patch)