Attachment 228238 Details for Bug 258753 – patch to 0.9.0 plus proposed changes

[patch] patch to 0.9.0 plus proposed changes

npe.patch (text/plain), 4.14 KB, created by Volodymyr Kostyrko on 2021-09-29 08:03:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volodymyr Kostyrko

Created: 2021-09-29 08:03:47 UTC

Size: 4.14 KB

patch

obsolete

>diff --git a/devel/ccache/Makefile.compilers b/devel/ccache/Makefile.compilers
>index f8d26ed711e2..db4b4f74d701 100644
>--- a/devel/ccache/Makefile.compilers
>+++ b/devel/ccache/Makefile.compilers
>@@ -18,7 +18,7 @@ CCACHE_COMPILERS+=	cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} \
> 			${GNU_COMPILERS:S|^|cpp|}
> 
> .if ${PORT_OPTIONS:MCLANGLINK}
>-CLANG_COMPILERS+=	33 34 35 36 37 38 39 40 50 60 70 80 90 10 11 12 -devel
>+CLANG_COMPILERS+=	33 34 35 36 37 38 39 40 50 60 70 80 90 10 11 12 13 -devel
> CCACHE_COMPILERS+=	clang clang++ ${CLANG_COMPILERS:S|^|clang|} \
> 			${CLANG_COMPILERS:S|^|clang++|} \
> 			${CLANG_COMPILERS:S|^|cpp|}
>diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
>index 0d469a8b3f86..c97759e9b1f4 100644
>--- a/mail/rmilter/Makefile
>+++ b/mail/rmilter/Makefile
>@@ -21,7 +21,7 @@ USE_GNOME=	glib20
> USERS=		_rmilter
> GROUPS=		_rmilter
> 
>-WITH_SENDMAIL_BASE=	yes
>+#WITH_SENDMAIL_BASE=	yes
> 
> OPTIONS_DEFINE=		DKIM
> OPTIONS_DEFAULT=	DKIM
>diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist
>index 891ce7fabc99..9ef1ce9df168 100644
>--- a/net/dhcpcd/pkg-plist
>+++ b/net/dhcpcd/pkg-plist
>@@ -10,6 +10,5 @@ sbin/dhcpcd
> %%EXAMPLESDIR%%/hooks/10-wpa_supplicant
> %%EXAMPLESDIR%%/hooks/15-timezone
> %%EXAMPLESDIR%%/hooks/29-lookup-hostname
>-%%EXAMPLESDIR%%/hooks/50-ypbind
> @sample %%EXAMPLESDIR%%/dhcpcd.conf etc/dhcpcd.conf
> @dir(_dhcp,_dhcp,) /var/db/dhcpcd
>diff --git a/net/minidlna/files/minidlna.in b/net/minidlna/files/minidlna.in
>index 4329e9c00927..e9f0acc71bcc 100644
>--- a/net/minidlna/files/minidlna.in
>+++ b/net/minidlna/files/minidlna.in
>@@ -16,16 +16,16 @@ rcvar=minidlna_enable
> load_rc_config $name
> 
> minidlna_enable=${minidlna_enable-"NO"}
>-minidlna_uid=${minidlna_uid-"%%USER%%"}
>+minidlna_user=${minidlna_user-"%%USER%%"}
> 
> command=%%PREFIX%%/sbin/minidlnad
> pidfile="/var/run/minidlna/minidlna.pid"
>-command_args="-P $pidfile -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf"
>+command_args="-P $pidfile -f %%PREFIX%%/etc/minidlna.conf"
> 
>-start_precmd="install -d -o $minidlna_uid ${pidfile%/*} /var/db/minidlna"
>+start_precmd="install -d -o $minidlna_user ${pidfile%/*} /var/db/minidlna"
> stop_postcmd="rm -f $pidfile"
> 
> extra_commands=rescan
>-rescan_cmd="$command -R -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf"
>+rescan_cmd="$command -R -f %%PREFIX%%/etc/minidlna.conf"
> 
> run_rc_command $1
>diff --git a/www/nginx-prometheus-exporter/Makefile b/www/nginx-prometheus-exporter/Makefile
>index 0abd30d810ef..e55b0cb67176 100644
>--- a/www/nginx-prometheus-exporter/Makefile
>+++ b/www/nginx-prometheus-exporter/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Jev BjÃ¶rsell <ports@ecadlabs.com>
> 
> PORTNAME=	nginx-prometheus-exporter
>-PORTVERSION=	0.8.0
>+PORTVERSION=	0.9.0
> DISTVERSIONPREFIX=v
> CATEGORIES=	www
> 
>diff --git a/www/nginx-prometheus-exporter/distinfo b/www/nginx-prometheus-exporter/distinfo
>index 668c2482714b..0c85e534e5f5 100644
>--- a/www/nginx-prometheus-exporter/distinfo
>+++ b/www/nginx-prometheus-exporter/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1592757496
>-SHA256 (nginxinc-nginx-prometheus-exporter-v0.8.0_GH0.tar.gz) = 04003952d22d3043cdd6eb60aedb382ab0bdaf74ac450fa2a4a927d79ac24e95
>-SIZE (nginxinc-nginx-prometheus-exporter-v0.8.0_GH0.tar.gz) = 2059700
>+TIMESTAMP = 1632902223
>+SHA256 (nginxinc-nginx-prometheus-exporter-v0.9.0_GH0.tar.gz) = ea4fc130c2e19751b4563c819a0641639077f9c300776a1bd7116b56a14f7eca
>+SIZE (nginxinc-nginx-prometheus-exporter-v0.9.0_GH0.tar.gz) = 2213762
>diff --git a/www/nginx-prometheus-exporter/files/nginx-prometheus-exporter.in b/www/nginx-prometheus-exporter/files/nginx-prometheus-exporter.in
>index a5d41a4a102b..fb8e4e282aa3 100644
>--- a/www/nginx-prometheus-exporter/files/nginx-prometheus-exporter.in
>+++ b/www/nginx-prometheus-exporter/files/nginx-prometheus-exporter.in
>@@ -42,7 +42,8 @@ load_rc_config $name
> pidfile=/var/run/nginx_prometheus_exporter.pid
> command="/usr/sbin/daemon"
> procname="%%PREFIX%%/bin/nginx-prometheus-exporter"
>-command_args="-p ${pidfile} /usr/bin/env ${procname} \
>+command_args="-f -T ${name} -p ${pidfile} \
>+    /usr/bin/env ${procname} \
>     --nginx.scrape-uri=${nginx_prometheus_exporter_scrape_uri} \
>     --web.listen-address=${nginx_prometheus_exporter_listen_address} \
>     ${nginx_prometheus_exporter_args}"

Flags:

arcade: maintainer-approval+

Actions: View | Diff

Attachments on bug 258753: 228238 | 228806