From owner-svn-ports-all@FreeBSD.ORG Thu Jun 12 11:23:24 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 97272AD0; Thu, 12 Jun 2014 11:23:24 +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 77A062F8A; Thu, 12 Jun 2014 11:23:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CBNO5x090453; Thu, 12 Jun 2014 11:23:24 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CBNOsm090451; Thu, 12 Jun 2014 11:23:24 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406121123.s5CBNOsm090451@svn.freebsd.org> From: Pawel Pekala Date: Thu, 12 Jun 2014 11:23:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357585 - in head/misc/crosspad: . 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.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: Thu, 12 Jun 2014 11:23:24 -0000 Author: pawel Date: Thu Jun 12 11:23:23 2014 New Revision: 357585 URL: http://svnweb.freebsd.org/changeset/ports/357585 QAT: https://qat.redports.org/buildarchive/r357585/ Log: - Add staging support, allow it as normal user - Add run dependency on perl, scripts are written in it, bump PORTREVISION for dependency change - Remove patch that hardcoded shebang to /usr/bin/perl, use CONFIGURE_ENV to set correct shebang for all scripts - Don't create/remove links in pkg-plist - this is done during packaging just fine Deleted: head/misc/crosspad/files/patch-aa Modified: head/misc/crosspad/Makefile head/misc/crosspad/pkg-plist Modified: head/misc/crosspad/Makefile ============================================================================== --- head/misc/crosspad/Makefile Thu Jun 12 11:02:50 2014 (r357584) +++ head/misc/crosspad/Makefile Thu Jun 12 11:23:23 2014 (r357585) @@ -3,32 +3,30 @@ PORTNAME= crosspad PORTVERSION= 19991202 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.itojun.org/pub/misc/ MAINTAINER= ports@FreeBSD.org COMMENT= Crosspad data downloader/converter +USES= perl5 +USE_PERL5= run GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_path_path_perl=${PERL} WRKSRC= ${WRKDIR}/crosspad/build -MAN1= crosspad2ps.1 crosspad2eps.1 crosspad2tgif.1 crosspad2idraw.1 \ - padload.1 - DOCS= PROTOCOL README.english README.japanese -NO_STAGE= yes - OPTIONS_DEFINE= DOCS -.include +post-patch: + @${REINPLACE_CMD} -E -e 's,(bin|man)dir),DESTDIR)$$(&,g' \ + -e 's,-(g|o) (bin|uucp),,g' \ + ${WRKSRC}/Makefile.in post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${PREFIX}/share/doc/crosspad - for i in $(DOCS); do \ - ${INSTALL_DATA} ${WRKSRC}/../$$i ${PREFIX}/share/doc/crosspad; \ - done -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/../|} ${STAGEDIR}${DOCSDIR} .include Modified: head/misc/crosspad/pkg-plist ============================================================================== --- head/misc/crosspad/pkg-plist Thu Jun 12 11:02:50 2014 (r357584) +++ head/misc/crosspad/pkg-plist Thu Jun 12 11:23:23 2014 (r357585) @@ -1,12 +1,16 @@ -bin/padload +bin/crosspad2eps +bin/crosspad2idraw bin/crosspad2ps -@exec cd %D/bin; ln -s crosspad2ps crosspad2eps -@exec cd %D/bin; ln -s crosspad2ps crosspad2tgif -@exec cd %D/bin; ln -s crosspad2ps crosspad2idraw -@unexec rm %D/bin/crosspad2eps 2>&1 >/dev/null || true -@unexec rm %D/bin/crosspad2tgif 2>&1 >/dev/null || true -@unexec rm %D/bin/crosspad2idraw 2>&1 >/dev/null || true -%%PORTDOCS%%share/doc/crosspad/PROTOCOL -%%PORTDOCS%%share/doc/crosspad/README.english -%%PORTDOCS%%share/doc/crosspad/README.japanese -%%PORTDOCS%%@dirrm share/doc/crosspad +bin/crosspad2tgif +@owner uucp +bin/padload +@owner +man/man1/crosspad2eps.1.gz +man/man1/crosspad2idraw.1.gz +man/man1/crosspad2ps.1.gz +man/man1/crosspad2tgif.1.gz +man/man1/padload.1.gz +%%PORTDOCS%%%%DOCSDIR%%/PROTOCOL +%%PORTDOCS%%%%DOCSDIR%%/README.english +%%PORTDOCS%%%%DOCSDIR%%/README.japanese +%%PORTDOCS%%@dirrm %%DOCSDIR%%