From owner-svn-ports-all@FreeBSD.ORG Sat May 24 17:21:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E7C1974; Sat, 24 May 2014 17:21:39 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AC142CE6; Sat, 24 May 2014 17:21:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OHLdsG006539; Sat, 24 May 2014 17:21:39 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OHLc2Z006531; Sat, 24 May 2014 17:21:38 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201405241721.s4OHLc2Z006531@svn.freebsd.org> From: Olli Hauer Date: Sat, 24 May 2014 17:21:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355058 - in head/www: cgiparse cgiparse/files man2web 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.18 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: Sat, 24 May 2014 17:21:39 -0000 Author: ohauer Date: Sat May 24 17:21:37 2014 New Revision: 355058 URL: http://svnweb.freebsd.org/changeset/ports/355058 QAT: https://qat.redports.org/buildarchive/r355058/ Log: - add stage support - allow build / strip without root privilege Added: head/www/cgiparse/files/ head/www/cgiparse/files/patch-Makefile.in (contents, props changed) Modified: head/www/cgiparse/Makefile head/www/cgiparse/pkg-plist head/www/man2web/Makefile head/www/man2web/pkg-plist Modified: head/www/cgiparse/Makefile ============================================================================== --- head/www/cgiparse/Makefile Sat May 24 17:20:50 2014 (r355057) +++ head/www/cgiparse/Makefile Sat May 24 17:21:37 2014 (r355058) @@ -9,17 +9,16 @@ MASTER_SITES= http://resnet.uoregon.edu/ MAINTAINER= ports@FreeBSD.org COMMENT= C library to parse CGI Forms -LIB_DEPENDS= mime.1:${PORTSDIR}/devel/mime +LIB_DEPENDS= libmime.so:${PORTSDIR}/devel/mime GNU_CONFIGURE= yes -MAN3= cgiclose.3 cgigetvalue.3 cginewquerystr.3 USE_LDCONFIG= yes CFLAGS+= "-fPIC" -NO_STAGE= yes .include post-install: - ${LN} -sf libcgiparse.so.1 ${PREFIX}/lib/libcgiparse.so + ${LN} -sf libcgiparse.so.1 ${STAGEDIR}${PREFIX}/lib/libcgiparse.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgiparse.so .include Added: head/www/cgiparse/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cgiparse/files/patch-Makefile.in Sat May 24 17:21:37 2014 (r355058) @@ -0,0 +1,44 @@ +--- ./Makefile.in.orig 2014-05-24 19:06:10.000000000 +0200 ++++ ./Makefile.in 2014-05-24 19:08:17.000000000 +0200 +@@ -38,7 +38,7 @@ + LIBDIR = @libdir@ + LIBOWN = 0 + LIBGRP = 0 +-LIBMOD = 0444 ++LIBMOD = 0644 + INCDIR = @includedir@ + INCOWN = 0 + INCGRP = 0 +@@ -72,24 +72,21 @@ + $(TPROG) $(TOBJS) .depend + + install: $(ARNAME) $(SONAME) $(PANAME) maninstall +- mkdir -p -m 755 $(LIBDIR) ++ mkdir -p -m 755 $(DESTDIR)$(LIBDIR) + for i in $(ARNAME) $(SONAME) $(PANAME); do \ +- cp $$i $(LIBDIR); \ +- chown $(LIBOWN):$(LIBGRP) $(LIBDIR)/$$i; \ +- chmod $(LIBMOD) $(LIBDIR)/$$i; \ ++ cp $$i $(DESTDIR)$(LIBDIR); \ ++ chmod $(LIBMOD) $(DESTDIR)$(LIBDIR)/$$i; \ + done +- mkdir -p -m 755 $(INCDIR) ++ mkdir -p -m 755 $(DESTDIR)$(INCDIR) + for i in $(INCS); do \ +- cp $$i $(INCDIR); \ +- chown $(INCOWN):$(INCGRP) $(INCDIR)/$$i; \ +- chmod $(INCMOD) $(INCDIR)/$$i; \ ++ cp $$i $(DESTDIR)$(INCDIR); \ ++ chmod $(INCMOD) $(DESTDIR)$(INCDIR)/$$i; \ + done + + maninstall: $(MAN3) +- cp $(MAN3) $(MANDIR)/man3 ++ cp $(MAN3) $(DESTDIR)$(MANDIR)/man3 + for i in $(MAN3); do \ +- chown $(MANOWN):$(MANGRP) $(MANDIR)/man3/$$i; \ +- chmod $(MANMOD) $(MANDIR)/man3/$$i; \ ++ chmod $(MANMOD) $(DESTDIR)$(MANDIR)/man3/$$i; \ + done + + depend: Modified: head/www/cgiparse/pkg-plist ============================================================================== --- head/www/cgiparse/pkg-plist Sat May 24 17:20:50 2014 (r355057) +++ head/www/cgiparse/pkg-plist Sat May 24 17:21:37 2014 (r355058) @@ -3,3 +3,6 @@ lib/libcgiparse.a lib/libcgiparse.so lib/libcgiparse.so.1 lib/libcgiparse_p.a +man/man3/cgiclose.3.gz +man/man3/cgigetvalue.3.gz +man/man3/cginewquerystr.3.gz Modified: head/www/man2web/Makefile ============================================================================== --- head/www/man2web/Makefile Sat May 24 17:20:50 2014 (r355057) +++ head/www/man2web/Makefile Sat May 24 17:21:37 2014 (r355058) @@ -15,18 +15,14 @@ CONFIGURE_ARGS= --bindir="${PREFIX}/${CG --with-manpath=/usr/share/man:${LOCALBASE}/man \ --with-distro=freebsd --enable-lynx +CGIDIR= www/cgi-bin PLIST_SUB= CGIDIR="${CGIDIR}" -CGIDIR= www/cgi-bin -MAN1= man2web.1 -MAN5= man2web.conf.5 - -NO_STAGE= yes post-extract: ${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/src/section_h/ # default Apache configuration disallows symlinks in cgi-bin post-install: - ${LN} -sf ${PREFIX}/${CGIDIR}/man2web ${PREFIX}/bin/man2web + ${LN} -sf ${PREFIX}/${CGIDIR}/man2web ${STAGEDIR}${PREFIX}/bin/man2web .include Modified: head/www/man2web/pkg-plist ============================================================================== --- head/www/man2web/pkg-plist Sat May 24 17:20:50 2014 (r355057) +++ head/www/man2web/pkg-plist Sat May 24 17:21:37 2014 (r355058) @@ -1,4 +1,6 @@ bin/man2web -%%CGIDIR%%/man2web etc/man2web.conf.default +man/man1/man2web.1.gz +man/man5/man2web.conf.5.gz +%%CGIDIR%%/man2web @dirrmtry %%CGIDIR%%