CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 15:40:25 Modified files: net/net-snmp : Makefile Added files: net/net-snmp/patches: patch-agent_mibgroup_hardware_fsys_fsys_getfsstats_c patch-agent_mibgroup_hardware_fsys_hw_fsys_c patch-agent_mibgroup_ucd-snmp_disk_hw_c patch-include_net-snmp_library_large_fd_set_h patch-snmplib_snmp_api_c Log message: various fixes to Net-SNMP, mostly from upstream repo, one chunk suggested by Joel Knight to avoid a segfault
Re: CVS: cvs.openbsd.org: ports
Hi. apcupsd works fine with this patch.
On Wed, November 23, 2011 03:13, Stuart Henderson wrote:
> On 2011/11/21 09:42, Marc Espie wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by: es...@cvs.openbsd.org 2011/11/21 09:42:53
>>
>> Modified files:
>> infrastructure/mk: bsd.port.mk
>>
>> Log message:
>> BASESYSCONFDIR points to /etc (global user settings), and SYSCONFDIR
>> is derived from it.
>> old march discussion, prodded by fgs@ about it.
>>
>
> So something like this should be alright now. (There are other
> ports that can be cleaned up too, but this one came to mind).
>
> Kirill, can you check that apcupsd still works for you with
> this diff please?
>
> espie, OK with you? The addition to SUBST_VARS here is because
> of MESSAGE-cgi.
>
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 20 Sep 2011 11:26:14 - 1.14
> +++ Makefile 23 Nov 2011 00:09:46 -
> @@ -8,6 +8,9 @@ DISTNAME =apcupsd-3.14.10
> PKGNAME-main = ${DISTNAME}
> PKGNAME-cgi =${DISTNAME:S/-/-cgi-/}
> PKGNAME-x11 =${DISTNAME:S/-/-x11-/}
> +REVISION-main = 0
> +REVISION-cgi = 0
> +REVISION-x11 = 0
>
> CATEGORIES = sysutils
>
> @@ -27,17 +30,17 @@ WANTLIB-main =c pthread
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=apcupsd/}
>
> -CONFIGURE_STYLE =gnu old # old prevents overriding sysconfdir
> +CONFIGURE_STYLE =gnu
> USE_GMAKE = Yes
> NO_REGRESS = Yes
> MAKE_FLAGS = VERBOSE=2
>
> WEB_ROOT = /var/www
> -SUBST_VARS +=WEB_ROOT
> +SUBST_VARS +=WEB_ROOT ^BASESYSCONFDIR
> +SYSCONFDIR = ${BASESYSCONFDIR}/apcupsd
>
> CONFIGURE_ARGS = --mandir=${PREFIX}/man \
> --sbindir=${PREFIX}/sbin \
> - --sysconfdir=${SYSCONFDIR}/apcupsd \
> --enable-install-distdir \
> --with-cgi-bin=${WEB_ROOT}/cgi-bin/apcupsd \
> --with-lock-dir=/var/run \
> @@ -77,9 +80,9 @@ WANTLIB-x11 += xcb-shm xcb z ${WANTLIB}
> FAKE_FLAGS = sysconfdir=${TRUEPREFIX}/share/examples/apcupsd/etc
>
> pre-configure:
> - perl -pi -e 's,/etc/apcupsd,${SYSCONFDIR}/apcupsd,g' \
> + perl -pi -e 's,/etc/apcupsd,${SYSCONFDIR},g' \
> ${WRKSRC}/doc/apcupsd.8 ${WRKSRC}/doc/apcaccess.8
> - perl -pi -e 's,/usr/local/etc/apcupsd,${SYSCONFDIR}/apcupsd,g' \
> + perl -pi -e 's,/usr/local/etc/apcupsd,${SYSCONFDIR},g' \
> ${WRKSRC}/doc/apcupsd.conf.5
> perl -pi -e 's,/etc/rc.apcupsd,${PREFIX}/sbin/apcupsctl,' \
> ${WRKSRC}/platforms/openbsd/README
> Index: pkg/MESSAGE-cgi
> ===
> RCS file: /cvs/ports/sysutils/apcupsd/pkg/MESSAGE-cgi,v
> retrieving revision 1.2
> diff -u -p -r1.2 MESSAGE-cgi
> --- pkg/MESSAGE-cgi 30 Aug 2011 09:59:30 - 1.2
> +++ pkg/MESSAGE-cgi 23 Nov 2011 00:09:46 -
> @@ -1,10 +1,10 @@
> Before using multimon and the other CGI programs, first ensure that
> apcupsd is configured to run the Network Information Server. This is
> -done by setting NETSERVER on in ${SYSCONFDIR}/apcupsd/apcupsd.conf.
> +done by setting NETSERVER on in ${SYSCONFDIR}/apcupsd.conf.
> This switch is on by default.
> To run scripts in chrooted apache (default behaviour), configuration
> files must be available to the webserver:
> -# mv ${SYSCONFDIR}/apcupsd /var/www/${SYSCONFDIR}/apcupsd
> -# ln -s /var/www/${SYSCONFDIR}/apcupsd ${SYSCONFDIR}/
> +# mv ${SYSCONFDIR} /var/www/${SYSCONFDIR}
> +# ln -s /var/www/${SYSCONFDIR} ${BASESYSCONFDIR}/
> And some libraries must be copied in:
> # ${WEB_ROOT}/cgi-bin/apcupsd/copy-libs.sh
> Index: pkg/MESSAGE-main
> ===
> RCS file: /cvs/ports/sysutils/apcupsd/pkg/MESSAGE-main,v
> retrieving revision 1.4
> diff -u -p -r1.4 MESSAGE-main
> --- pkg/MESSAGE-main 30 Aug 2011 09:59:30 - 1.4
> +++ pkg/MESSAGE-main 23 Nov 2011 00:09:46 -
> @@ -1,7 +1,7 @@
> To allow the system to be fully powered down (in order to preserve
> UPS battery), add the following lines to /etc/rc.shutdown:
>
> -if [ -f ${SYSCONFDIR}/apcupsd/powerfail ]; then
> +if [ -f ${SYSCONFDIR}/powerfail ]; then
>echo
>echo "APCUPSD requested this system is powered down."
>echo
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-main,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-main
> --- pkg/PLIST-main30 Aug 2011 09:59:30 - 1.2
> +++ pkg/PLIST-main23 Nov 2011 00:09:46 -
> @@ -20,38 +20,38 @@ share/doc/apcupsd/DISCLAIMER
> share/doc/apc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2011/11/28 09:17:47 Modified files: telephony/pjsua: Makefile distinfo Log message: Bugfixing update to pjsua-1.12
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2011/11/28 08:53:06 Modified files: audio/shell-fm : Makefile distinfo audio/shell-fm/patches: patch-Makefile Removed files: audio/shell-fm/patches: patch-manual_shell-fm_1 patch-source_include_globals_h patch-source_include_interface_h patch-source_interface_c patch-source_play_c patch-source_radio_c patch-source_sckif_c Log message: Update to the most recent snapshot from git.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2011/11/28 08:38:38 Modified files: security/gnupg2: Makefile Log message: clearer comment
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2011/11/28 08:28:49 Modified files: net/amule : Makefile distinfo net/amule/patches: patch-acinclude_m4 patch-configure_in patch-src_Preferences_cpp patch-src_amule_cpp patch-src_utils_cas_configfile_c net/amule/pkg : PLIST-daemon PLIST-main PLIST-web Added files: net/amule/patches: patch-m4_libpng_m4 patch-src_ListenSocket_cpp patch-src_utils_scripts_denoiser_rules patch-src_webserver_src_php_lexer_c Removed files: net/amule/patches: patch-docs_man_Makefile_in patch-docs_man_ed2k_1 patch-src_BaseClient_cpp patch-src_DownloadQueue_cpp patch-src_UploadBandwidthThrottler_cpp patch-src_utils_aLinkCreator_docs_Makefile_in patch-src_utils_aLinkCreator_docs_alc_1 patch-src_webserver_src_WebInterface_cpp Log message: Update to aMule version 2.3.1 - The "unobvious evil date" version.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2011/11/28 07:11:25 Modified files: audio/pianobar : Makefile distinfo audio/pianobar/patches: patch-Makefile Added files: audio/pianobar/patches: patch-src_config_h Log message: Update to pianobar-2011.11.21
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 05:59:50 Modified files: infrastructure/package: check-plist Log message: devel/quirks is important, enforce adding it to the plists in check-plist as done with pkglocatedb. Adding it here suggested by naddy@ (I was originally going to add it to all the plists).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2011/11/28 05:32:04 Modified files: mail/evolution : Makefile mail/evolution/pkg: PLIST-main PLIST-plugins Removed files: mail/evolution/pkg: PFRAG.shared-main PFRAG.shared-plugins Log message: Move the pst importer plugin into -plugins where it belongs. Set SHARED_ONLY and merge PLISTs accordingly.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 04:16:30 Modified files: astro/xphoon : Makefile distinfo astro/xphoon/patches: patch-xphoon_c astro/xphoon/pkg: PLIST Log message: update xphoon to newer version (from 2000, rather than 1991. :-) adds support for the southern hemisphere.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 03:56:13 Modified files: sysutils/nut : Makefile sysutils/nut/pkg: PLIST-main Log message: better SYSCONFDIR handling, get rid of CONFIGURE_STYLE=...old hack
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 03:52:03 Modified files: net/flow-tools : Makefile net/flow-tools/pkg: PLIST Log message: better SYSCONFDIR handling, get rid of CONFIGURE_STYLE=...old hack
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 03:46:19 Modified files: sysutils/apcupsd: Makefile sysutils/apcupsd/pkg: MESSAGE-cgi MESSAGE-main PLIST-main apcupsd.rc Log message: Better SYSCONFDIR handling (remove the CONFIGURE_STYLE=...old hack) now that we have BASESYSCONFDIR. Maintainer timeout.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2011/11/28 03:30:22 Modified files: infrastructure : README Added files: infrastructure/bin: bundle-readmes check_register find-build-order Removed files: infrastructure/build: bundle-readmes check_register find-build-order Log message: - move to bin and adjust paths where needed, manpages will follown soon
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 03:18:53 Modified files: biology/nutdb : Makefile biology/nutdb/pkg: PLIST Added files: biology/nutdb/patches: patch-fltk_Makefile Log message: Fix path to nutdb's config files and build the gui version. Problem noted by Juha Erkkila (with a diff, but I fixed the problems in a different way).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2011/11/28 01:37:52 Modified files: net/no-ip : Makefile net/no-ip/pkg : PLIST Added files: net/no-ip/pkg : noip2.rc Log message: Add an rc script for no-ip2, from Mark Peoples with tweaks by me Maintainer timeout, ok ajacoutot@
