From owner-svn-ports-all@FreeBSD.ORG Sun Mar 23 16:15:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD27B5A0; Sun, 23 Mar 2014 16:15:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9134A44; Sun, 23 Mar 2014 16:15:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NGFFIC076814; Sun, 23 Mar 2014 16:15:15 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NGFEAm076809; Sun, 23 Mar 2014 16:15:14 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201403231615.s2NGFEAm076809@svn.freebsd.org> From: Bryan Drewery Date: Sun, 23 Mar 2014 16:15:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348867 - in head/ports-mgmt/poudriere-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Mar 2014 16:15:15 -0000 Author: bdrewery Date: Sun Mar 23 16:15:14 2014 New Revision: 348867 URL: http://svnweb.freebsd.org/changeset/ports/348867 QAT: https://qat.redports.org/buildarchive/r348867/ Log: - Fix installation of hook samples - Fix build on 8.x Added: head/ports-mgmt/poudriere-devel/files/ head/ports-mgmt/poudriere-devel/files/patch-Makefile.am (contents, props changed) head/ports-mgmt/poudriere-devel/files/patch-Makefile.in (contents, props changed) head/ports-mgmt/poudriere-devel/files/patch-src__poudriered__poudriered.c (contents, props changed) Modified: head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere-devel/pkg-plist Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Sun Mar 23 15:40:10 2014 (r348866) +++ head/ports-mgmt/poudriere-devel/Makefile Sun Mar 23 16:15:14 2014 (r348867) @@ -2,6 +2,7 @@ PORTNAME= poudriere PORTVERSION= 3.0.99.20140320 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://fossil.etoilebsd.net/poudriere/tarball/ \ LOCAL/bdrewery/${PORTNAME}/ @@ -19,6 +20,7 @@ FSL_CHKIN= 0966e62bc4 USES= uidfix GNU_CONFIGURE= yes +ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= ZSH OPTIONS_SUB= yes Added: head/ports-mgmt/poudriere-devel/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere-devel/files/patch-Makefile.am Sun Mar 23 16:15:14 2014 (r348867) @@ -0,0 +1,21 @@ +--- ./Makefile.am.orig 2014-03-23 10:59:46.490421007 -0500 ++++ ./Makefile.am 2014-03-23 11:00:25.195417823 -0500 +@@ -12,6 +12,7 @@ + dtimagesdir= $(datatablesdir)/images + dtjsdir= $(datatablesdir)/js + rcdir= $(sysconfdir)/rc.d ++hookdir= $(sysconfdir)/poudriere.d/hooks + + dist_bin_SCRIPTS= src/bin/poudriere + +@@ -20,6 +21,10 @@ + sysconf_DATA= src/etc/poudriere.conf.sample \ + src/etc/poudriered.conf.sample + ++hook_DATA= src/etc/poudriere.d/hooks/bulk.sh.sample \ ++ src/etc/poudriere.d/hooks/pkgbuild.sh.sample ++ ++ + dist_pkgdata_DATA= src/share/poudriere/bulk.sh \ + src/share/poudriere/clean.sh \ + src/share/poudriere/common.sh \ Added: head/ports-mgmt/poudriere-devel/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere-devel/files/patch-Makefile.in Sun Mar 23 16:15:14 2014 (r348867) @@ -0,0 +1,120 @@ +--- ./Makefile.in.orig 2014-03-23 10:59:51.978420717 -0500 ++++ ./Makefile.in 2014-03-23 11:00:31.953420721 -0500 +@@ -125,7 +125,8 @@ + "$(DESTDIR)$(btimgdir)" "$(DESTDIR)$(btjsdir)" \ + "$(DESTDIR)$(dtcssdir)" "$(DESTDIR)$(dtimagesdir)" \ + "$(DESTDIR)$(dtjsdir)" "$(DESTDIR)$(htmldir)" \ +- "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)" ++ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(hookdir)" \ ++ "$(DESTDIR)$(sysconfdir)" + PROGRAMS = $(pkglibexec_PROGRAMS) $(sbin_PROGRAMS) + am_cpdup_OBJECTS = src/libexec/poudriere/cpdup/cpdup-cpdup.$(OBJEXT) \ + src/libexec/poudriere/cpdup/cpdup-hcproto.$(OBJEXT) \ +@@ -238,7 +239,7 @@ + DATA = $(dist_assets_DATA) $(dist_awk_DATA) $(dist_btcss_DATA) \ + $(dist_btimg_DATA) $(dist_btjs_DATA) $(dist_dtcss_DATA) \ + $(dist_dtimages_DATA) $(dist_dtjs_DATA) $(dist_html_DATA) \ +- $(dist_pkgdata_DATA) $(sysconf_DATA) ++ $(dist_pkgdata_DATA) $(hook_DATA) $(sysconf_DATA) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +@@ -374,11 +375,15 @@ + dtimagesdir = $(datatablesdir)/images + dtjsdir = $(datatablesdir)/js + rcdir = $(sysconfdir)/rc.d ++hookdir = $(sysconfdir)/poudriere.d/hooks + dist_bin_SCRIPTS = src/bin/poudriere + dist_man_MANS = src/bin/poudriere.8 + sysconf_DATA = src/etc/poudriere.conf.sample \ + src/etc/poudriered.conf.sample + ++hook_DATA = src/etc/poudriere.d/hooks/bulk.sh.sample \ ++ src/etc/poudriere.d/hooks/pkgbuild.sh.sample ++ + dist_pkgdata_DATA = src/share/poudriere/bulk.sh \ + src/share/poudriere/clean.sh \ + src/share/poudriere/common.sh \ +@@ -1263,6 +1268,27 @@ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) ++install-hookDATA: $(hook_DATA) ++ @$(NORMAL_INSTALL) ++ @list='$(hook_DATA)'; test -n "$(hookdir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(hookdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(hookdir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(hookdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(hookdir)" || exit $$?; \ ++ done ++ ++uninstall-hookDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(hook_DATA)'; test -n "$(hookdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(hookdir)'; $(am__uninstall_files_from_dir) + install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) + @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ +@@ -1509,7 +1535,7 @@ + check: check-am + all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(assetsdir)" "$(DESTDIR)$(awkdir)" "$(DESTDIR)$(btcssdir)" "$(DESTDIR)$(btimgdir)" "$(DESTDIR)$(btjsdir)" "$(DESTDIR)$(dtcssdir)" "$(DESTDIR)$(dtimagesdir)" "$(DESTDIR)$(dtjsdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \ ++ for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(assetsdir)" "$(DESTDIR)$(awkdir)" "$(DESTDIR)$(btcssdir)" "$(DESTDIR)$(btimgdir)" "$(DESTDIR)$(btjsdir)" "$(DESTDIR)$(dtcssdir)" "$(DESTDIR)$(dtimagesdir)" "$(DESTDIR)$(dtjsdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(hookdir)" "$(DESTDIR)$(sysconfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am +@@ -1588,7 +1614,7 @@ + install-dist_btjsDATA install-dist_dtcssDATA \ + install-dist_dtimagesDATA install-dist_dtjsDATA \ + install-dist_htmlDATA install-dist_pkgdataDATA \ +- install-dist_rcSCRIPTS install-man ++ install-dist_rcSCRIPTS install-hookDATA install-man + + install-dvi: install-dvi-am + +@@ -1642,7 +1668,7 @@ + uninstall-dist_dtcssDATA uninstall-dist_dtimagesDATA \ + uninstall-dist_dtjsDATA uninstall-dist_htmlDATA \ + uninstall-dist_pkgdataDATA uninstall-dist_rcSCRIPTS \ +- uninstall-man uninstall-pkglibexecPROGRAMS \ ++ uninstall-hookDATA uninstall-man uninstall-pkglibexecPROGRAMS \ + uninstall-sbinPROGRAMS uninstall-sysconfDATA + + uninstall-man: uninstall-man8 +@@ -1664,10 +1690,10 @@ + install-dist_dtimagesDATA install-dist_dtjsDATA \ + install-dist_htmlDATA install-dist_pkgdataDATA \ + install-dist_rcSCRIPTS install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-man8 install-pdf \ +- install-pdf-am install-pkglibexecPROGRAMS install-ps \ +- install-ps-am install-sbinPROGRAMS install-strip \ ++ install-exec-am install-hookDATA install-html install-html-am \ ++ install-info install-info-am install-man install-man8 \ ++ install-pdf install-pdf-am install-pkglibexecPROGRAMS \ ++ install-ps install-ps-am install-sbinPROGRAMS install-strip \ + install-sysconfDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ +@@ -1677,9 +1703,9 @@ + uninstall-dist_btjsDATA uninstall-dist_dtcssDATA \ + uninstall-dist_dtimagesDATA uninstall-dist_dtjsDATA \ + uninstall-dist_htmlDATA uninstall-dist_pkgdataDATA \ +- uninstall-dist_rcSCRIPTS uninstall-man uninstall-man8 \ +- uninstall-pkglibexecPROGRAMS uninstall-sbinPROGRAMS \ +- uninstall-sysconfDATA ++ uninstall-dist_rcSCRIPTS uninstall-hookDATA uninstall-man \ ++ uninstall-man8 uninstall-pkglibexecPROGRAMS \ ++ uninstall-sbinPROGRAMS uninstall-sysconfDATA + + + .PHONY: gen-make-wiki Added: head/ports-mgmt/poudriere-devel/files/patch-src__poudriered__poudriered.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere-devel/files/patch-src__poudriered__poudriered.c Sun Mar 23 16:15:14 2014 (r348867) @@ -0,0 +1,13 @@ +--- ./src/poudriered/poudriered.c.orig 2014-03-23 11:01:01.147420893 -0500 ++++ ./src/poudriered/poudriered.c 2014-03-23 11:01:25.271419416 -0500 +@@ -669,8 +669,8 @@ + dateformat == NULL) + continue; + +- if (strftime_l(datestr, BUFSIZ, ucl_object_tostring(dateformat), +- now, NULL) <= 0) ++ if (strftime(datestr, BUFSIZ, ucl_object_tostring(dateformat), ++ now) <= 0) + continue; + + if (!strcmp(datestr, ucl_object_tostring(when))) { Modified: head/ports-mgmt/poudriere-devel/pkg-plist ============================================================================== --- head/ports-mgmt/poudriere-devel/pkg-plist Sun Mar 23 15:40:10 2014 (r348866) +++ head/ports-mgmt/poudriere-devel/pkg-plist Sun Mar 23 16:15:14 2014 (r348867) @@ -2,6 +2,8 @@ bin/poudriere etc/poudriere.conf.sample etc/poudriered.conf.sample etc/rc.d/poudriered +%%ETCDIR%%/hooks/bulk.sh.sample +%%ETCDIR%%/hooks/pkgbuild.sh.sample libexec/poudriere/cpdup libexec/poudriere/dirempty libexec/poudriere/dirwatch @@ -69,3 +71,5 @@ man/man8/poudriere.8.gz @dirrm %%DATADIR%%/awk @dirrm %%DATADIR%% @dirrm libexec/poudriere +@dirrmtry %%ETCDIR%% +@dirrmtry %%ETCDIR%%/hooks