summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/libwcalc/buildlink3.mk4
-rw-r--r--cad/mex-wcalc/Makefile22
-rw-r--r--cad/sci-wcalc/Makefile4
-rw-r--r--cad/stdio-wcalc/Makefile4
-rw-r--r--cad/wcalc/Makefile4
-rw-r--r--cad/wcalc/Makefile.common18
-rw-r--r--cad/wcalc/distinfo9
-rw-r--r--cad/wcalc/patches/patch-aa13
8 files changed, 32 insertions, 46 deletions
diff --git a/cad/libwcalc/buildlink3.mk b/cad/libwcalc/buildlink3.mk
index 7c3361281e1..435cde24263 100644
--- a/cad/libwcalc/buildlink3.mk
+++ b/cad/libwcalc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/01 03:49:19 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/08 06:31:54 dmcmahill Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwcalc}
BUILDLINK_PACKAGES+= libwcalc
.if !empty(LIBWCALC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwcalc+= libwcalc-0.9*
+BUILDLINK_DEPENDS.libwcalc+= libwcalc-1.0*
BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc
.endif # LIBWCALC_BUILDLINK3_MK
diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile
index b7388287564..1650f7a315f 100644
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/08 06:31:54 dmcmahill Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -45,24 +45,24 @@ ONLY_FOR_PLATFORM= Linux-*-i386 SunOS-*-sparc*
.include "../../mk/bsd.prefs.mk"
-_MATLAB_ARCH= unknown
-_MATLAB_MEX= mex
-_MEX_SUFX= unknown
+DEF_MATLAB_ARCH= unknown
+DEF_MATLAB_MEX= mex
+DEF_MEX_SUFX= unknown
.if ${OPSYS} == "Linux"
. if (${MACHINE_ARCH} == "i386")
-_MATLAB_ARCH= glnx86
-_MEX_SUFX= mexglx
+DEF_MATLAB_ARCH= glnx86
+DEF_MEX_SUFX= mexglx
. endif
.elif ${OPSYS} == "SunOS"
. if (${MACHINE_ARCH} == "sparc")
-_MATLAB_ARCH= sol2
-_MEX_SUFX= mexsol
+DEF_MATLAB_ARCH= sol2
+DEF_MEX_SUFX= mexsol
. endif
.endif
-MATLAB_ARCH?= ${_MATLAB_ARCH}
-MEX_SUFX?= ${_MEX_SUFX}
+MATLAB_ARCH?= ${DEF_MATLAB_ARCH}
+MEX_SUFX?= ${DEF_MEX_SUFX}
-MATLAB_MEX?= ${_MATLAB_MEX}
+MATLAB_MEX?= ${DEF_MATLAB_MEX}
PLIST_SUBST+= MEX_SUFX=${MEX_SUFX:Q}
diff --git a/cad/sci-wcalc/Makefile b/cad/sci-wcalc/Makefile
index a6d152687ef..b6830b8cda2 100644
--- a/cad/sci-wcalc/Makefile
+++ b/cad/sci-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 23:55:02 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/08 06:31:54 dmcmahill Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --without-octave
CONFIGURE_ARGS+= --with-scilab=${SCI:Q}
PLIST_SUBST+= SCIVERSION=${SCIVERSION:Q}
-MESSAGE_SUBST+= SCIVERSION=${SCIVERSION}
+MESSAGE_SUBST+= SCIVERSION=${SCIVERSION:Q}
.include "../../cad/libwcalc/buildlink3.mk"
.include "../../math/scilab/buildlink3.mk"
diff --git a/cad/stdio-wcalc/Makefile b/cad/stdio-wcalc/Makefile
index a29d498905f..4ae3df7f45c 100644
--- a/cad/stdio-wcalc/Makefile
+++ b/cad/stdio-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 12:08:10 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/08 06:31:54 dmcmahill Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= stdio-${DISTNAME}
COMMENT= Stdio Based Transmission Line Analysis/Synthesis Calculator
-# Only enable the scilab frontend
+# Only enable the stdio frontend
CONFIGURE_ARGS+= --disable-cgi
CONFIGURE_ARGS+= --disable-gtk1
CONFIGURE_ARGS+= --disable-gtk2
diff --git a/cad/wcalc/Makefile b/cad/wcalc/Makefile
index 20d03eeb282..af783bf15a7 100644
--- a/cad/wcalc/Makefile
+++ b/cad/wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/04 15:49:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/08 06:31:54 dmcmahill Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -38,7 +38,7 @@ NO_CONFIGURE= yes
NO_BUILD= yes
NO_MTREE= yes
-do-patch: #empty
+do-patch: # empty
do-install: # empty
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/wcalc/Makefile.common b/cad/wcalc/Makefile.common
index da41a0bae72..1ef44edb955 100644
--- a/cad/wcalc/Makefile.common
+++ b/cad/wcalc/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2005/12/05 23:55:02 rillig Exp $
+# $NetBSD: Makefile.common,v 1.6 2006/01/08 06:31:54 dmcmahill Exp $
#
-DISTNAME= wcalc-0.9
+DISTNAME= wcalc-1.0
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wcalc/}
@@ -33,17 +33,17 @@ WCALC_CGIDIR?= libexec/cgi-bin
WCALC_CGIPATH?= /cgi-wcalc/
# setup the directories and URI path
-CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/${WCALC_HTMLDIR}
+CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/${WCALC_HTMLDIR:Q}
CONFIGURE_ARGS+= --with-htmlpath=${WCALC_HTMLPATH:Q}
-CONFIGURE_ARGS+= --with-cgibin=${PREFIX}/${WCALC_CGIDIR}
+CONFIGURE_ARGS+= --with-cgibin=${PREFIX}/${WCALC_CGIDIR:Q}
CONFIGURE_ARGS+= --with-cgipath=${WCALC_CGIPATH:Q}
# make sure we can refer to these paths in the MESSAGE
-MESSAGE_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR}
-MESSAGE_SUBST+= WCALC_CGIPATH=${WCALC_CGIPATH}
-MESSAGE_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR}
-MESSAGE_SUBST+= WCALC_HTMLPATH=${WCALC_HTMLPATH}
-MESSAGE_SUBST+= WCALC_DIR=${WCALC_DIR}
+MESSAGE_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR:Q}
+MESSAGE_SUBST+= WCALC_CGIPATH=${WCALC_CGIPATH:Q}
+MESSAGE_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR:Q}
+MESSAGE_SUBST+= WCALC_HTMLPATH=${WCALC_HTMLPATH:Q}
+MESSAGE_SUBST+= WCALC_DIR=${WCALC_DIR:Q}
# and the PLIST too
PLIST_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR:Q}
diff --git a/cad/wcalc/distinfo b/cad/wcalc/distinfo
index 8f936b776b9..3895782cfba 100644
--- a/cad/wcalc/distinfo
+++ b/cad/wcalc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/12/01 23:58:16 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 06:31:54 dmcmahill Exp $
-SHA1 (wcalc-0.9.tar.gz) = d59d03a8b1e1eceaae032ab755f0ee9ca30d0b95
-RMD160 (wcalc-0.9.tar.gz) = cccbbac6f4eca55a2a695d73da62cc4535e47edf
-Size (wcalc-0.9.tar.gz) = 1341805 bytes
-SHA1 (patch-aa) = 484dd40f6773230d43d5c66f1985fd0dba5d56e5
+SHA1 (wcalc-1.0.tar.gz) = 733a1786d2549ebb3265170c0d317c4ccf650427
+RMD160 (wcalc-1.0.tar.gz) = a6db2fb8ca84cdc6ec2bed8d8dfc77439dcb89bf
+Size (wcalc-1.0.tar.gz) = 1363727 bytes
diff --git a/cad/wcalc/patches/patch-aa b/cad/wcalc/patches/patch-aa
deleted file mode 100644
index e85be3dd558..00000000000
--- a/cad/wcalc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/01 23:58:16 dmcmahill Exp $
-
-The "" was getting eaten by the wrapper scripts causing the shared modules
-to not be built.
-
---- mex-wcalc/mexlink.orig 2005-10-24 12:12:06.000000000 -0400
-+++ mex-wcalc/mexlink 2005-11-30 10:43:27.000000000 -0500
-@@ -65,4 +65,4 @@
-
- set -x
--$LIBTOOL --mode=link $CC -avoid-version -export-dynamic -module -shrext "" -rpath $pkglibexecdir $args
-+$LIBTOOL --mode=link $CC -avoid-version -export-dynamic -module -shrext '""' -rpath $pkglibexecdir $args
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 00:15:40 +0000