sysutils/conky: Update to 1.15.0

- Sort option helpers
- Remove REINPLACE_CMD duplicating patch file
- Remove patch merged upstream

sysutils/conky/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	conky
-PORTVERSION=	1.14.0
+PORTVERSION=	1.15.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -80,12 +80,6 @@ METAR_DESC=		Display METAR weather reports
 METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
 METAR_IMPLIES=		CURL
 
-MOC_DESC=		Control MOC (Music On Console)
-MOC_CMAKE_BOOL=		BUILD_MOC
-
-MPD_DESC=		Control MPD (Music Player Daemon)
-MPD_CMAKE_BOOL=		BUILD_MPD
-
 MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc \
 			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR}
@@ -93,6 +87,12 @@ MANPAGES_USES=		python:3.7+,build
 MANPAGES_CMAKE_BOOL=	BUILD_DOCS
 MANPAGES_PLIST_FILES=	man/man1/conky.1.gz
 
+MOC_DESC=		Control MOC (Music On Console)
+MOC_CMAKE_BOOL=		BUILD_MOC
+
+MPD_DESC=		Control MPD (Music Player Daemon)
+MPD_CMAKE_BOOL=		BUILD_MPD
+
 NCURSES_DESC=		Use ncurses to draw on terminals
 NCURSES_CMAKE_BOOL=	BUILD_NCURSES
 NCURSES_USES=		ncurses:port
@@ -135,8 +135,6 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src_CMakeLists.txt
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/^# \(set(RELEASE true\)/\1/' \
-		${WRKSRC}/cmake/Conky.cmake
 	@${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \
 		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
 .if ${LUA_DEFAULT} == 5.2

sysutils/conky/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1665603150
-SHA256 (brndnmtthws-conky-v1.14.0_GH0.tar.gz) = 36314449441eeae4d2bb1713cdd0738bfb581a9b23d5374137965684de04d964
-SIZE (brndnmtthws-conky-v1.14.0_GH0.tar.gz) = 1797564
+TIMESTAMP = 1665942072
+SHA256 (brndnmtthws-conky-v1.15.0_GH0.tar.gz) = bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+SIZE (brndnmtthws-conky-v1.15.0_GH0.tar.gz) = 1800684

sysutils/conky/files/patch-src_freebsd.cc

@@ -1,30 +0,0 @@
---- src/freebsd.cc.orig	2022-10-12 18:18:08 UTC
-+++ src/freebsd.cc
-@@ -460,6 +460,27 @@ int get_battery_perct(const char *) {
-   return batcapacity;
- }
- 
-+void get_battery_power_draw(char *buffer, unsigned int n, const char *bat) {
-+  int rate = 0;
-+  double ret = 0;
-+
-+  /*
-+   * hw.acpi.battery.rate returns battery discharge rate in mW,
-+   * or -1 (according to docs, but also 0 in practice) when not discharging.
-+   *
-+   * ref. acpi_battery(4)
-+   */
-+  if (GETSYSCTL("hw.acpi.battery.rate", rate)) {
-+    fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.rate\"\n");
-+  }
-+
-+  if (rate > 0) {
-+    ret = (double)rate/(double)1000;
-+  }
-+
-+  snprintf(buffer, n, "%.1f", ret);
-+}
-+
- double get_battery_perct_bar(struct text_object *obj) {
-   int batperct = get_battery_perct(obj->data.s);
-   return batperct;