Attachment #68472 for bug #100652

View | Details | Raw Unified | Return to bug 100652
Collapse All | Expand All

Lines 7-13 Link Here

(-)/var/tmp/jspice3/Makefile (-2 / +14 lines)
7		7
8	PORTNAME= jspice3	8	PORTNAME= jspice3
9	PORTVERSION= 2.5	9	PORTVERSION= 2.5
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= cad	11	CATEGORIES= cad
12	MASTER_SITES= http://www.wrcad.com/ftp/pub/ \	12	MASTER_SITES= http://www.wrcad.com/ftp/pub/ \
13	ftp://ftp.srware.com/pub/	13	ftp://ftp.srware.com/pub/
Lines 17-28 Link Here
17		17
18	CONFLICTS= spice-[0-9]*	18	CONFLICTS= spice-[0-9]*
19		19
		20	OPTIONS= X "Use X window system" no
		21
		22	.include <bsd.port.pre.mk>
		23
		24	.if defined(WITH_X)
20	USE_XLIB= yes	25	USE_XLIB= yes
		26	.endif
21		27
22	pre-configure:	28	pre-configure:
23	@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g ; \	29	@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g ; \
24	s+-O -g+${CFLAGS}+g;' \	30	s+-O -g+${CFLAGS}+g;' \
25	${WRKSRC}/conf/unixconf/mkheader.0	31	${WRKSRC}/conf/unixconf/mkheader.0
		32	.if defined(WITH_X)
		33	@${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' \
		34	${WRKSRC}/conf/unixconf/mkheader.0
		35	.else
		36	@${ECHO} "#undef HAVE_X11" >> ${WRKSRC}/src/include/spice.h
		37	.endif
26		38
27	do-build:	39	do-build:
28	@(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build)	40	@(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build)
Lines 37-40 Link Here
37	${RM} -R ${PREFIX}/lib/jspice3/examples	49	${RM} -R ${PREFIX}/lib/jspice3/examples
38	.endif	50	.endif
39		51
40	.include <bsd.port.mk>	52	.include <bsd.port.post.mk>




--- build.orig	Tue May  1 09:37:12 2001
+++ build	Fri Jul 21 06:27:29 2006
@@ -22,7 +22,7 @@
         echo '#######################################################################'> conf/mkheader.in
         echo '####### Makefile generated by build script ############################'>> conf/mkheader.in
         echo VERSION = $version>> conf/mkheader.in
-        echo DATE = `/bin/date`>> conf/mkheader.in
+        echo DATE = `/usr/bin/env LANG=C /bin/date`>> conf/mkheader.in
         echo '#######################################################################'>> conf/mkheader.in
         cat conf/unixconf/mkheader.0 >> conf/mkheader.in
     else
@@ -92,8 +92,14 @@
         fi
         echo Creating makefiles in the subdirectories...
         $makeprog make
+        if [ $? -ne 0 ]; then
+		exit $?
+	fi
         echo ...done
         $makeprog all 2> ../../errs
+        if [ $? -ne 0 ]; then
+		exit $?
+	fi
         echo done
         echo Check the errs file for any problems.
         echo To finish the installation, cd to src/bin, become root, and type




--- conf/unixconf/mkheader.0.orig	Tue Jan 15 19:15:36 2002
+++ conf/unixconf/mkheader.0	Fri Jul 21 06:11:55 2006
@@ -18,7 +18,7 @@
 BUG_ADDR = stevew@srware.com
 

 
 # spice daemon log file
 SPICED_LOG = /tmp/spiced.log
@@ -43,6 +43,6 @@
 LDFLAGS = @LIBS@
 RANLIB = @RANLIB@
 INCX = @X_CFLAGS@
-LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
+#%%WITH_X%%LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
 INTERFACE_OPTS = -DWANT_MFB -DWANT_X11
 MFB = mfb




--- src/bin/help.c.orig	Fri Jul 21 06:16:08 2006
+++ src/bin/help.c	Fri Jul 21 06:18:15 2006
@@ -14,6 +14,7 @@
 #include <pwd.h>
 #endif
 
+static char *hcopydev;
 #ifdef HAVE_X11
 
 #include <X11/Intrinsic.h>
@@ -22,7 +23,6 @@
 Display *Xdisplay;
 static XtAppContext app_con;
 static Widget toplevel;
-static char *hcopydev;
 
 static String fallback_resources[] = {
     
@@ -188,7 +188,7 @@
 {
     if (!strcmp(n, kw_hcopydev)) {
         strcpy(r, hcopydev);
-        return (True);
+        return (1);
     }
     return (false);
 }

Line 0 Link Here

(-)/var/tmp/jspice3/files/patch-src+lib+plot+x11.c (+20 lines)
	1	--- src/lib/plot/x11.c.orig Thu Sep 2 21:43:35 2004
	2	+++ src/lib/plot/x11.c Fri Jul 21 06:06:00 2006
	3	@@ -2205,7 +2205,7 @@
	4	void
	5	com_setrdb(wl)
	6
	7	-wordlist *wl;
	8	+void *wl;
	9	{
	10	/* be silent */
	11	}
	12	@@ -2213,7 +2213,7 @@
	13	int
	14	PopUpErrMessage(fp)
	15
	16	-File *fp;
	17	+void *fp;
	18	{
	19	return (0);
	20	}

Return to bug 100652

Lines 1-11 Link Here

(-)/var/tmp/jspice3/files/patch-build (-3 / +18 lines)
1	--- build.orig Fri Jul 14 23:07:15 2006	1	--- build.orig Tue May 1 09:37:12 2001
2	+++ build Fri Jul 14 23:07:32 2006	2	+++ build Fri Jul 21 06:27:29 2006
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	echo '#######################################################################'> conf/mkheader.in	4	echo '#######################################################################'> conf/mkheader.in
5	echo '####### Makefile generated by build script ############################'>> conf/mkheader.in	5	echo '####### Makefile generated by build script ############################'>> conf/mkheader.in
6	echo VERSION = $version>> conf/mkheader.in	6	echo VERSION = $version>> conf/mkheader.in
7	- echo DATE = `/bin/date`>> conf/mkheader.in	7	- echo DATE = `/bin/date`>> conf/mkheader.in
8	+ echo DATE = `/bin/env LANG=C /bin/date`>> conf/mkheader.in	8	+ echo DATE = `/usr/bin/env LANG=C /bin/date`>> conf/mkheader.in
9	echo '#######################################################################'>> conf/mkheader.in	9	echo '#######################################################################'>> conf/mkheader.in
10	cat conf/unixconf/mkheader.0 >> conf/mkheader.in	10	cat conf/unixconf/mkheader.0 >> conf/mkheader.in
11	else	11	else
		12	@@ -92,8 +92,14 @@
		13	fi
		14	echo Creating makefiles in the subdirectories...
		15	$makeprog make
		16	+ if [ $? -ne 0 ]; then
		17	+ exit $?
		18	+ fi
		19	echo ...done
		20	$makeprog all 2> ../../errs
		21	+ if [ $? -ne 0 ]; then
		22	+ exit $?
		23	+ fi
		24	echo done
		25	echo Check the errs file for any problems.
		26	echo To finish the installation, cd to src/bin, become root, and type

Lines 1-5 Link Here

(-)/var/tmp/jspice3/files/patch-conf+unixconf+mkheader.0 (-2 / +10 lines)
1	--- conf/unixconf/mkheader.0.orig Tue Feb 28 16:30:32 2006	1	--- conf/unixconf/mkheader.0.orig Tue Jan 15 19:15:36 2002
2	+++ conf/unixconf/mkheader.0 Tue Feb 28 16:36:32 2006	2	+++ conf/unixconf/mkheader.0 Fri Jul 21 06:11:55 2006
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4	BUG_ADDR = stevew@srware.com	4	BUG_ADDR = stevew@srware.com
5		5
Lines 9-11 Link Here
9		9
10	# spice daemon log file	10	# spice daemon log file
11	SPICED_LOG = /tmp/spiced.log	11	SPICED_LOG = /tmp/spiced.log
		12	@@ -43,6 +43,6 @@
		13	LDFLAGS = @LIBS@
		14	RANLIB = @RANLIB@
		15	INCX = @X_CFLAGS@
		16	-LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
		17	+#%%WITH_X%%LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
		18	INTERFACE_OPTS = -DWANT_MFB -DWANT_X11
		19	MFB = mfb

Line 0 Link Here

(-)/var/tmp/jspice3/files/patch-src+bin+help.c (+27 lines)
	1	--- src/bin/help.c.orig Fri Jul 21 06:16:08 2006
	2	+++ src/bin/help.c Fri Jul 21 06:18:15 2006
	3	@@ -14,6 +14,7 @@
	4	#include <pwd.h>
	5	#endif
	6
	7	+static char *hcopydev;
	8	#ifdef HAVE_X11
	9
	10	#include <X11/Intrinsic.h>
	11	@@ -22,7 +23,6 @@
	12	Display *Xdisplay;
	13	static XtAppContext app_con;
	14	static Widget toplevel;
	15	-static char *hcopydev;
	16
	17	static String fallback_resources[] = {
	18
	19	@@ -188,7 +188,7 @@
	20	{
	21	if (!strcmp(n, kw_hcopydev)) {
	22	strcpy(r, hcopydev);
	23	- return (True);
	24	+ return (1);
	25	}
	26	return (false);
	27	}