Attachment 86573 Details for Bug 123026 – file.diff

[patch] file.diff

file.diff (text/plain), 8.67 KB, created by Pedro F. Giffuni on 2008-04-23 21:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2008-04-23 21:00:02 UTC

Size: 8.67 KB

patch

obsolete

>diff -ruN varkon.orig/Makefile varkon/Makefile
>--- varkon.orig/Makefile	2008-04-19 12:46:57.000000000 -0500
>+++ varkon/Makefile	2008-04-23 14:43:21.000000000 -0500
>@@ -1,53 +1,35 @@
> # New ports collection makefile for:	Varkon
> # Date created:		19 April 2003
>-# Whom:			Pedro Giffuni <giffunip@asme.org>
>+# Whom:			Pedro F. Giffuni
> #
> # $FreeBSD: ports/cad/varkon/Makefile,v 1.10 2008/04/19 17:46:57 miwi Exp $
> #
> 
> PORTNAME=	varkon
>-PORTVERSION=	1.17D
>-PORTREVISION=	2
>+PORTVERSION=	1.19C
> CATEGORIES=	cad
>-MASTER_SITES=	http://www.tech.oru.se/cad/varkon/pub/linux/:sources \
>-		http://www.tech.oru.se/cad/varkon/:docs
>-DISTFILES=	${PORTNAME}_sources_${PORTVERSION}${EXTRACT_SUFX}:sources \
>-		v_man.zip:docs m_man.zip:docs
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	${PORTNAME}
>+DISTNAME=	Varkon_sources_${PORTVERSION}
> DIST_SUBDIR=	varkon
>-EXTRACT_ONLY=	${PORTNAME}_sources_${PORTVERSION}${EXTRACT_SUFX}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A free CAD system and applications development tool
> 
>-.ifndef	NOPORTDOCS
>-BUILD_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
>-.endif
>-
> USE_GL=		yes
> USE_GMAKE=	yes
>-VARKON_ROOT=	${WRKDIR}/${PORTNAME}_${PORTVERSION}
>+ALL_TARGET=
>+VARKON_ROOT=	${WRKDIR}/Varkon_${PORTVERSION}
> WRKSRC=		${VARKON_ROOT}/sources
>-MAKE_ENV+=	VARKON_ROOT=${VARKON_ROOT}
> 
> VARKON_PREFIX=	${PREFIX}/share/varkon
>-WEB_BROWSER?=	mozilla
>-
>-.include <bsd.port.pre.mk>
>+WEB_BROWSER?=	firefox
> 
>-.if ${OSVERSION} >= 700042
>-BROKEN=		Does not compile with GCC 4.2
>-.endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's+%%MAKE%%+${GMAKE}+g;' ${WRKSRC}/make_varkon
>-	@${REINPLACE_CMD} -e 's+netscape+${WEB_BROWSER}+ ' \
>-	     ${VARKON_ROOT}/cnf/ini/english/linux
>+do-configure:
> 	@${REINPLACE_CMD} -e 's+%%VARKON_PREFIX%%+${VARKON_PREFIX}+ ; s+%%DOCSDIR%%+${DOCSDIR}+g ' \
> 	     ${VARKON_ROOT}/com/english/varkon
> 	@${FIND} ${WRKSRC} -name 'Makefile.FreeBSD' -print0 | ${XARGS} -0 \
>-		${REINPLACE_CMD} -e 's+/usr/X11R6+${LOCALBASE}+g'
>-do-build:
>-	@(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} make_varkon )
>+		${REINPLACE_CMD} -e 's+/usr/local+${LOCALBASE}+g'
> 
> do-install:
> 	@${MKDIR} ${VARKON_PREFIX}/bin
>@@ -63,18 +45,11 @@
> 	@${MKDIR} ${VARKON_PREFIX}/cnf/ini
> 	@${INSTALL} ${VARKON_ROOT}/cnf/ini/english/linux \
> 	  ${VARKON_PREFIX}/cnf/ini/freebsd
>-	@${CP} -R ${VARKON_ROOT}/mdf/english ${VARKON_PREFIX}/mdf
>+	@${CP} -R ${VARKON_ROOT}/mdf ${VARKON_PREFIX}/mdf
> 	@${INSTALL_SCRIPT} ${VARKON_ROOT}/com/english/varkon \
> 	  ${PREFIX}/bin
> .ifndef NOPORTDOCS
>-	@${MKDIR} ${EXAMPLESDIR}
>-	@${CP} -R ${VARKON_ROOT}/app ${EXAMPLESDIR}
>-	@${CP} -R ${VARKON_ROOT}/pid ${EXAMPLESDIR}
> 	@${MKDIR} ${DOCSDIR}	#Varkon Manual
>-	@unzip ${DISTDIR}/${DIST_SUBDIR}/v_man	\
>-		-d ${DOCSDIR}
>-	@unzip -uo ${DISTDIR}/${DIST_SUBDIR}/m_man	\
>-		-d ${DOCSDIR}
>+	@${CP} -R ${VARKON_ROOT}/man/* ${DOCSDIR}
> .endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN varkon.orig/distinfo varkon/distinfo
>--- varkon.orig/distinfo	2005-11-23 19:22:47.000000000 -0500
>+++ varkon/distinfo	2008-04-20 20:39:12.000000000 -0500
>@@ -1,9 +1,3 @@
>-MD5 (varkon/varkon_sources_1.17D.tar.gz) = 4a7e4573cc525b9e39428df6f97c036f
>-SHA256 (varkon/varkon_sources_1.17D.tar.gz) = a57a0d866506a9f4e458ac25ee13602e3d82bee4bb069bf071c6e37385d3170e
>-SIZE (varkon/varkon_sources_1.17D.tar.gz) = 2169441
>-MD5 (varkon/v_man.zip) = 0b751bfb53e630d95c9941d5d13fed6f
>-SHA256 (varkon/v_man.zip) = fc0ea1f364e93d96551a3823a7b953eee0ba715f3db91e4a9d48c2ff90fba516
>-SIZE (varkon/v_man.zip) = 298630
>-MD5 (varkon/m_man.zip) = ffd90e0ebdc0b5caf400d1a1f74e31fc
>-SHA256 (varkon/m_man.zip) = 35c68788dc9e3c32b51910b93d7eec2ce87cd5c385af26e2eb664a3c020dbee5
>-SIZE (varkon/m_man.zip) = 479583
>+MD5 (varkon/Varkon_sources_1.19C.tar.gz) = 5c9c723c62205f2ba2e289db40f4d467
>+SHA256 (varkon/Varkon_sources_1.19C.tar.gz) = cb50d6ce486bc71c8ce3ec7b752e764fff34fbf5f02fd392abe77f069987797b
>+SIZE (varkon/Varkon_sources_1.19C.tar.gz) = 3467744
>diff -ruN varkon.orig/files/patch--com+english+varkon varkon/files/patch--com+english+varkon
>--- varkon.orig/files/patch--com+english+varkon	2003-07-07 18:35:33.000000000 -0500
>+++ varkon/files/patch--com+english+varkon	2008-04-23 14:00:57.000000000 -0500
>@@ -1,80 +1,58 @@
>---- ../com/english/varkon.orig	Thu Mar 27 06:36:43 2003
>-+++ ../com/english/varkon	Tue May 13 18:49:31 2003
>-@@ -13,12 +13,12 @@
>- # Root directory for VARKON installation. Change this
>- # line to point to the right location.
>+--- ../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)`
>  
>--VARKON_ROOT=/usr/varkon/varkon_1.17D
>+ # Alternative 2, explicit path.
>+-# VARKON_ROOT=/home/username/varkon/varkon_2.Xx
> +VARKON_ROOT=%%VARKON_PREFIX%%
>  export VARKON_ROOT
>  
>- # Standard menufiles  (*.MDF, *.INC)
>- 
>--VARKON_MDF=$VARKON_ROOT/mdf/english
>-+VARKON_MDF=$VARKON_ROOT/mdf
>- export VARKON_MDF
>- 
>- # Project files  (*.PID)
>-@@ -27,7 +27,7 @@
>- # versions of VARKON to persist in a common place.
>- # All users need write access to this directory
>- 
>--VARKON_PID=$VARKON_ROOT/pid
>-+VARKON_PID=$HOME/pid
>- export VARKON_PID
>- 
>- # Errormessages   (*.ERM)
>-@@ -37,7 +37,7 @@
>+ # 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
>  
>- # System module library   (*.MBO)
>-@@ -52,7 +52,7 @@
>+ # 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
>-@@ -81,7 +81,7 @@
>+@@ -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
>  
>- # Default root for VARKON applications
>-@@ -91,7 +91,7 @@
>- # not interfere with old jobs.
>- # All users need write access to this directory
>- 
>--VARKON_PRD=$VARKON_ROOT/app
>-+VARKON_PRD=$HOME/app
>- export VARKON_PRD
>- 
>- # PATH for executables (xvarkon, mbsc, plotterdrivers)
>-@@ -111,14 +111,14 @@
>+ # 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.
>- 
>- xvarkon $1 $2    \
>---i$VARKON_INI/linux
>-+-i$VARKON_INI/freebsd
>+-$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:
>- 
>- # xvarkon $1 $2    \
>--# -i$VARKON_INI/linux -i$HOME/cnf/ini/english/my_own_inifile
>-+# -i$VARKON_INI/freebsd -i$HOME/cnf/ini/english/my_own_inifile
>- 
>- # If you want to run the system in pure drafting mode, add
>- # "-r" to the command line.
>--# xvarkon -r $1 $2 -i$VARKON_INI/linux
>-+# xvarkon -r $1 $2 -i$VARKON_INI/freebsd
>+@@ -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
>diff -ruN varkon.orig/files/patch-IG+src+varkon.c varkon/files/patch-IG+src+varkon.c
>--- varkon.orig/files/patch-IG+src+varkon.c	1969-12-31 19:00:00.000000000 -0500
>+++ varkon/files/patch-IG+src+varkon.c	2008-04-23 13:41:13.000000000 -0500
>@@ -0,0 +1,19 @@
>+--- IG/src/varkon.c.orig	2008-04-23 13:36:40.000000000 -0500
>++++ IG/src/varkon.c	2008-04-23 13:40:00.000000000 -0500
>+@@ -257,14 +257,14 @@
>+ /*
>+ ***Open startup_logfile.
>+ */
>+-   strcpy(lfname,getenv("VARKON_ROOT"));
>++   strcpy(lfname,getenv("VARKON_TMP"));
>+    strcat(lfname,"/varkon.LOG");
>+    if ( (startup_logfile=fopen(lfname,"w")) == NULL )
>+      {
>+      printf("Can't open startup_logfile %s\n",lfname);
>+      exit(-1);
>+      }
>+-   fprintf(startup_logfile,"VARKON_ROOT is %s\n",getenv("VARKON_ROOT"));
>++   fprintf(startup_logfile,"VARKON_TMP is %s\n",getenv("VARKON_TMP"));
>+    fflush(startup_logfile);
>+ /*
>+ ***System is now starting up.
>diff -ruN varkon.orig/files/patch-Makefile varkon/files/patch-Makefile
>--- varkon.orig/files/patch-Makefile	1969-12-31 19:00:00.000000000 -0500
>+++ varkon/files/patch-Makefile	2008-04-20 21:04:34.000000000 -0500
>@@ -0,0 +1,13 @@
>+--- Makefile.orig	2008-04-20 21:03:40.000000000 -0500
>++++ Makefile	2008-04-20 21:03:56.000000000 -0500
>+@@ -12,8 +12,8 @@
>+ #=========================================================

Actions: View | Diff

Attachments on bug 123026: 86573 | 86574