From owner-svn-ports-all@FreeBSD.ORG Fri Oct 18 23:18:20 2013 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 ESMTP id 2C5E6263; Fri, 18 Oct 2013 23:18:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) 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 00D762587; Fri, 18 Oct 2013 23:18:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9INIJIV085182; Fri, 18 Oct 2013 23:18:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9INIJN5085180; Fri, 18 Oct 2013 23:18:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310182318.r9INIJN5085180@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 18 Oct 2013 23:18:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330788 - head/misc/xsw 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.14 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: Fri, 18 Oct 2013 23:18:20 -0000 Author: bapt Date: Fri Oct 18 23:18:19 2013 New Revision: 330788 URL: http://svnweb.freebsd.org/changeset/ports/330788 Log: Enable stage USES=gmake Modified: head/misc/xsw/Makefile head/misc/xsw/pkg-plist Modified: head/misc/xsw/Makefile ============================================================================== --- head/misc/xsw/Makefile Fri Oct 18 23:12:02 2013 (r330787) +++ head/misc/xsw/Makefile Fri Oct 18 23:18:19 2013 (r330788) @@ -8,7 +8,9 @@ CATEGORIES= misc MASTER_SITES= GOOGLE_CODE MAINTAINER= bapt@FreeBSD.org -COMMENT= A tool for creating presentations +COMMENT= Tool for creating presentations + +OPTIONS_DEFINE= DOCS RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick @@ -19,18 +21,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.if !defined(NO_INSTALL_MANPAGES) -MAN1= xsw.1 \ - xsw2pdf.1 \ - xswconv.1 - -MANCOMPRESSED= no -.endif - -.if defined(.PARSEDIR) -USE_GMAKE= yes -.endif - DOCS= AUTHORS \ COPYING \ NEWS \ @@ -40,25 +30,12 @@ DOCS= AUTHORS \ TODO \ doc/xsw.vim -NO_STAGE= yes -.include - -do-install: - (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install) - (cd ${WRKSRC}/data && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install) -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} -.endfor -.endif - -.if !defined(NO_INSTALL_MANPAGES) -.for manpage in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/man/man1/${manpage} ${MAN1PREFIX}/man/man1 -.endfor -.endif +post-patch: + @${REINPLACE_CMD} -e "s,./install-fonts ,./install-fonts \$$(DESTDIR)," \ + ${WRKSRC}/data/Makefile.in + +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/misc/xsw/pkg-plist ============================================================================== --- head/misc/xsw/pkg-plist Fri Oct 18 23:12:02 2013 (r330787) +++ head/misc/xsw/pkg-plist Fri Oct 18 23:18:19 2013 (r330788) @@ -3,6 +3,9 @@ bin/xsw2jpeg bin/xsw2pdf bin/xsw2png bin/xswconv +man/man1/xsw.1.gz +man/man1/xsw2pdf.1.gz +man/man1/xswconv.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS @@ -25,6 +28,6 @@ bin/xswconv %%DATADIR%%/tutorial/tutorial.xsw %%DATADIR%%/tutorial/tutorial.xsw.in %%DATADIR%%/tutorial/tux.png +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrm %%DATADIR%%/tutorial @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%