ports/100652: [MAINTAINER] cad/jspice3: add OPTIONS, fix exit status
Stanislav Sedov
ssedov at mbsd.msk.ru
Fri Jul 21 06:40:16 UTC 2006
>Number: 100652
>Category: ports
>Synopsis: [MAINTAINER] cad/jspice3: add OPTIONS, fix exit status
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 21 06:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006
>Description:
- Add options to allow user to select whether to depend on X or not
- Fix return status of build shell script to make 'make' happy
Added file(s):
- files/patch-src+bin+help.c
- files/patch-src+lib+plot+x11.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- jspice3-2.5_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/jspice3/Makefile /var/tmp/jspice3/Makefile
--- /usr/ports/cad/jspice3/Makefile Fri Jul 21 09:02:06 2006
+++ /var/tmp/jspice3/Makefile Fri Jul 21 10:29:12 2006
@@ -7,7 +7,7 @@
PORTNAME= jspice3
PORTVERSION= 2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= cad
MASTER_SITES= http://www.wrcad.com/ftp/pub/ \
ftp://ftp.srware.com/pub/
@@ -17,12 +17,24 @@
CONFLICTS= spice-[0-9]*
+OPTIONS= X "Use X window system" no
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_X)
USE_XLIB= yes
+.endif
pre-configure:
@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g ; \
s+-O -g+${CFLAGS}+g;' \
${WRKSRC}/conf/unixconf/mkheader.0
+.if defined(WITH_X)
+ @${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' \
+ ${WRKSRC}/conf/unixconf/mkheader.0
+.else
+ @${ECHO} "#undef HAVE_X11" >> ${WRKSRC}/src/include/spice.h
+.endif
do-build:
@(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build)
@@ -37,4 +49,4 @@
${RM} -R ${PREFIX}/lib/jspice3/examples
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/cad/jspice3/files/patch-build /var/tmp/jspice3/files/patch-build
--- /usr/ports/cad/jspice3/files/patch-build Fri Jul 21 09:02:06 2006
+++ /var/tmp/jspice3/files/patch-build Fri Jul 21 10:28:50 2006
@@ -1,11 +1,26 @@
---- build.orig Fri Jul 14 23:07:15 2006
-+++ build Fri Jul 14 23:07:32 2006
+--- 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 = `/bin/env LANG=C /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
diff -ruN --exclude=CVS /usr/ports/cad/jspice3/files/patch-conf+unixconf+mkheader.0 /var/tmp/jspice3/files/patch-conf+unixconf+mkheader.0
--- /usr/ports/cad/jspice3/files/patch-conf+unixconf+mkheader.0 Fri Jul 21 09:02:06 2006
+++ /var/tmp/jspice3/files/patch-conf+unixconf+mkheader.0 Fri Jul 21 10:28:50 2006
@@ -1,5 +1,5 @@
---- conf/unixconf/mkheader.0.orig Tue Feb 28 16:30:32 2006
-+++ conf/unixconf/mkheader.0 Tue Feb 28 16:36:32 2006
+--- 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 at srware.com
@@ -9,3 +9,11 @@
# 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
diff -ruN --exclude=CVS /usr/ports/cad/jspice3/files/patch-src+bin+help.c /var/tmp/jspice3/files/patch-src+bin+help.c
--- /usr/ports/cad/jspice3/files/patch-src+bin+help.c Thu Jan 1 03:00:00 1970
+++ /var/tmp/jspice3/files/patch-src+bin+help.c Fri Jul 21 10:28:50 2006
@@ -0,0 +1,27 @@
+--- 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);
+ }
diff -ruN --exclude=CVS /usr/ports/cad/jspice3/files/patch-src+lib+plot+x11.c /var/tmp/jspice3/files/patch-src+lib+plot+x11.c
--- /usr/ports/cad/jspice3/files/patch-src+lib+plot+x11.c Thu Jan 1 03:00:00 1970
+++ /var/tmp/jspice3/files/patch-src+lib+plot+x11.c Fri Jul 21 10:28:50 2006
@@ -0,0 +1,20 @@
+--- src/lib/plot/x11.c.orig Thu Sep 2 21:43:35 2004
++++ src/lib/plot/x11.c Fri Jul 21 06:06:00 2006
+@@ -2205,7 +2205,7 @@
+ void
+ com_setrdb(wl)
+
+-wordlist *wl;
++void *wl;
+ {
+ /* be silent */
+ }
+@@ -2213,7 +2213,7 @@
+ int
+ PopUpErrMessage(fp)
+
+-File *fp;
++void *fp;
+ {
+ return (0);
+ }
--- jspice3-2.5_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list