Date: Fri, 7 Feb 2014 21:23:30 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343298 - in head/cad/varkon: . files Message-ID: <201402072123.s17LNU8n020119@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Feb 7 21:23:30 2014 New Revision: 343298 URL: http://svnweb.freebsd.org/changeset/ports/343298 QAT: https://qat.redports.org/buildarchive/r343298/ Log: cad/varkon: - Add stage support and LICENSE - While here rename patches to match up makepatch PR: ports/186475 Submitted by: Eero Hänninen <fax@nohik.ee> Added: head/cad/varkon/files/patch-cnf__ini__english__linux - copied unchanged from r343239, head/cad/varkon/files/patch--cnf__ini__english__linux head/cad/varkon/files/patch-com__english__varkon - copied unchanged from r343239, head/cad/varkon/files/patch--com+english+varkon Deleted: head/cad/varkon/files/patch--cnf__ini__english__linux head/cad/varkon/files/patch--com+english+varkon Modified: head/cad/varkon/Makefile Modified: head/cad/varkon/Makefile ============================================================================== --- head/cad/varkon/Makefile Fri Feb 7 21:22:41 2014 (r343297) +++ head/cad/varkon/Makefile Fri Feb 7 21:23:30 2014 (r343298) @@ -11,6 +11,9 @@ DIST_SUBDIR= varkon MAINTAINER= ports@FreeBSD.org COMMENT= Free CAD system and applications development tool +LICENSE= GPLv2 LGPL20 +LICENSE_COMB= dual + LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils @@ -26,9 +29,7 @@ MAKE_JOBS_UNSAFE= yes VARKON_PREFIX= ${PREFIX}/lib/${PORTNAME} -NO_STAGE= yes - -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-extract: @${FIND} ${WRKSRC} -name "*.o" -delete @@ -47,23 +48,21 @@ do-configure: s|cc $$(LIBS)|$$(CC) $$(LIBS)|' do-install: - (cd ${WRKSRC}/com/english && ${INSTALL_SCRIPT} varkon ${PREFIX}/bin) - @${MKDIR} ${VARKON_PREFIX} + ${INSTALL_SCRIPT} ${WRKSRC}/com/english/varkon ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${VARKON_PREFIX} .for i in erm lib mdf - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${VARKON_PREFIX}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${VARKON_PREFIX}) .endfor - @${MKDIR} ${VARKON_PREFIX}/bin - (cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * ${VARKON_PREFIX}/bin) - @${MKDIR} ${VARKON_PREFIX}/cnf + @${MKDIR} ${STAGEDIR}${VARKON_PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${VARKON_PREFIX}/bin + @${MKDIR} ${STAGEDIR}${VARKON_PREFIX}/cnf .for i in fnt icons plt tol - @(cd ${WRKSRC}/cnf && ${COPYTREE_SHARE} ${i} ${VARKON_PREFIX}/cnf) + @(cd ${WRKSRC}/cnf && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${VARKON_PREFIX}/cnf) .endfor - @${MKDIR} ${VARKON_PREFIX}/cnf/ini - (cd ${WRKSRC}/cnf/ini/english && ${INSTALL_DATA} linux \ - ${VARKON_PREFIX}/cnf/ini/freebsd) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} #Varkon Manual - @(cd ${WRKSRC}/man && ${COPYTREE_SHARE} . ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${VARKON_PREFIX}/cnf/ini + ${INSTALL_DATA} ${WRKSRC}/cnf/ini/english/linux \ + ${STAGEDIR}${VARKON_PREFIX}/cnf/ini/freebsd + @${MKDIR} ${STAGEDIR}${DOCSDIR} #Varkon Manual + @(cd ${WRKSRC}/man && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Copied: head/cad/varkon/files/patch-cnf__ini__english__linux (from r343239, head/cad/varkon/files/patch--cnf__ini__english__linux) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/varkon/files/patch-cnf__ini__english__linux Fri Feb 7 21:23:30 2014 (r343298, copy of r343239, head/cad/varkon/files/patch--cnf__ini__english__linux) @@ -0,0 +1,11 @@ +--- cnf/ini/english/linux.orig 2012-11-17 20:42:44.000000000 +0900 ++++ cnf/ini/english/linux 2012-11-24 02:20:24.000000000 +0900 +@@ -42,6 +42,8 @@ + !***Varkon will display the file $VARKON_DOC/no_html_viewer.txt + !***in a list window. + !* ++varkon.html_viewer: xdg-open ++! + !***Suse Linux with KDE can use Konqueror + !varkon.html_viewer: konqueror + ! Copied: head/cad/varkon/files/patch-com__english__varkon (from r343239, head/cad/varkon/files/patch--com+english+varkon) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/varkon/files/patch-com__english__varkon Fri Feb 7 21:23:30 2014 (r343298, copy of r343239, head/cad/varkon/files/patch--com+english+varkon) @@ -0,0 +1,58 @@ +--- com/english/varkon.orig 2008-03-07 18:27:29.000000000 -0500 ++++ com/english/varkon 2008-04-23 13:59:24.000000000 -0500 +@@ -16,10 +16,10 @@ + + # Root directory for VARKON installation. + # Alternative 1, relative path. +-VARKON_ROOT=`(cd $(dirname $0); cd ..; cd ..; pwd)` ++#VARKON_ROOT=`(cd $(dirname $0); cd ..; cd ..; pwd)` + + # Alternative 2, explicit path. +-# VARKON_ROOT=/home/username/varkon/varkon_2.Xx ++VARKON_ROOT=%%VARKON_PREFIX%% + export VARKON_ROOT + + # Module library path (*.MBO) +@@ -44,7 +44,7 @@ + export VARKON_ERM + + # The VARKON documentation (*.htm) +-VARKON_DOC=$VARKON_ROOT/man ++VARKON_DOC=%%DOCSDIR%% + export VARKON_DOC + + # Temporary files +@@ -53,7 +53,7 @@ + # directory should usually reside on the local machine + # so you may set it up differently for different users. + # All users need write access to this directory +-VARKON_TMP=$VARKON_ROOT/tmp ++VARKON_TMP=/tmp + export VARKON_TMP + + # Fonts for graphical text +@@ -77,7 +77,7 @@ + export VARKON_TOL + + # Standard resources for X-Windows +-VARKON_INI=$VARKON_ROOT/cnf/ini/english ++VARKON_INI=$VARKON_ROOT/cnf/ini + export VARKON_INI + + # PATH for executables (xvarkon, mbsc and plotterdrivers) +@@ -96,7 +96,7 @@ + # if you want to. Don't edit the standard ini-file included + # in the distribution or you will have to do it all + # over again when updating the system. +-$VARKON_BIN/xvarkon -GLOBAL -i$VARKON_INI/linux ++$VARKON_BIN/xvarkon -GLOBAL -i$VARKON_INI/freebsd + + # With an inifile of your own it would look something + # like the following: +@@ -114,4 +114,4 @@ + # + # If you want to specify a default job directory use the -jd + # option on the command line. Here is an example: +-# $VARKON_BIN/xvarkon -GLOBAL -jd /home/my_directory/my_varkon_jobs +\ No newline at end of file ++# $VARKON_BIN/xvarkon -GLOBAL -jd /home/my_directory/my_varkon_jobs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402072123.s17LNU8n020119>