Re: Preventing substitutions in PLIST ?
On 10/12/14 13:08, Stuart Cassoff wrote:
On 09/26/14 10:46, Stuart Cassoff wrote:
On 09/16/14 21:48, Stuart Cassoff wrote:
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?=8.5
MODTCL_MODPATH=lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+= MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't
currently have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Another way to do this would be to change the Tcl module
dirs to be like modules/85 instead of modules/8.5, then
the MODTCL_MODPATH stuff wouldn't be needed.
Here are the diffs for doint it this way. Simpler.
Also simplified the existing layout Tcl itself:
removes a couple of dirs, shortens module path.
Also a fix for TkCon.
The more that Tcl Modules are leveraged the better things are for everyone:
smaller OpenBSD packages with less files and faster Tcl package loading in Tcl.
There will shortly be releases of 8.5.17 and 8.6.3.
I already have updated ports based on the rc's.
I'd really like to get this in now, before the coming update.
Finally, I've been at this for almost a year.
It would be nice to finish and move on.
Stu
Re: Preventing substitutions in PLIST ?
On 10/20/14 16:26, Landry Breuil wrote:
On Sun, Oct 12, 2014 at 01:08:37PM -0400, Stuart Cassoff wrote:
On 09/26/14 10:46, Stuart Cassoff wrote:
On 09/16/14 21:48, Stuart Cassoff wrote:
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?= 8.5
MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+= MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't
currently have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Another way to do this would be to change the Tcl module
dirs to be like modules/85 instead of modules/8.5, then
the MODTCL_MODPATH stuff wouldn't be needed.
Here are the diffs for doint it this way. Simpler.
Also simplified the existing layout Tcl itself:
removes a couple of dirs, shortens module path.
Also a fix for TkCon.
Can you remind me why you hardcode 85 for tcllib/tklib/tkcon ?
Other than that, you know better than anyone how this stuff should be
laid, so just move ahead, dont wait for months for someone to okay that..
Great, thanks!
The 85 is hardcoded for two reasons:
1) Tcl modules should be installed so that they are
available to the lowest Tcl version they'll work with.
2) Using 8.5 will cause unwelcome PLIST substitutions
that can apparently only be remedied by complicating
things with more variables and explanations.
Stu
Re: Preventing substitutions in PLIST ?
On 10/20/14 17:39, Landry Breuil wrote:
On Mon, Oct 20, 2014 at 05:12:32PM -0400, Stuart Cassoff wrote:
On 10/20/14 16:26, Landry Breuil wrote:
On Sun, Oct 12, 2014 at 01:08:37PM -0400, Stuart Cassoff wrote:
On 09/26/14 10:46, Stuart Cassoff wrote:
On 09/16/14 21:48, Stuart Cassoff wrote:
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?= 8.5
MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+=MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't
currently have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Another way to do this would be to change the Tcl module
dirs to be like modules/85 instead of modules/8.5, then
the MODTCL_MODPATH stuff wouldn't be needed.
Here are the diffs for doint it this way. Simpler.
Also simplified the existing layout Tcl itself:
removes a couple of dirs, shortens module path.
Also a fix for TkCon.
Can you remind me why you hardcode 85 for tcllib/tklib/tkcon ?
Other than that, you know better than anyone how this stuff should be
laid, so just move ahead, dont wait for months for someone to okay that..
Great, thanks!
The 85 is hardcoded for two reasons:
1) Tcl modules should be installed so that they are
available to the lowest Tcl version they'll work with.
2) Using 8.5 will cause unwelcome PLIST substitutions
that can apparently only be remedied by complicating
things with more variables and explanations.
Yeah, i got that part - but does it mean that tcl 8.6 also looks for
modules/85 in addition to modules/86 ?
Yes, exactly.
Almost all modules will end up under 85 unless they're for Tcl 8.6 only.
$ echo 'puts [tcl::tm::path list]' | tclsh8.6
/usr/local/lib/tcl/modules/85 /usr/local/lib/tcl/modules/86
/usr/local/lib/tcl/tcl8.6/modules
Stu
NEW: Tclarc4random, Jimarc4random
Tcl interface to arc4random(3). Jim interface to arc4random(3). Stu tclarc4random-0.2-port.tar.gz Description: application/gzip jimarc4random-0.2-port.tar.gz Description: application/gzip
Re: Preventing substitutions in PLIST ?
On 09/26/14 10:46, Stuart Cassoff wrote:
On 09/16/14 21:48, Stuart Cassoff wrote:
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?= 8.5
MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+=MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't currently
have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Another way to do this would be to change the Tcl module
dirs to be like modules/85 instead of modules/8.5, then
the MODTCL_MODPATH stuff wouldn't be needed.
Here are the diffs for doint it this way. Simpler.
Also simplified the existing layout Tcl itself:
removes a couple of dirs, shortens module path.
Also a fix for TkCon.
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile22 Sep 2014 16:54:11 - 1.32
+++ Makefile12 Oct 2014 16:43:55 -
@@ -4,6 +4,7 @@ COMMENT = Tool Command Language
DISTNAME = tcl8.5.16
PKGNAME = tcl-8.5.16
+REVISION = 0
SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
Index: patches/patch-library_tm_tcl
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-library_tm_tcl,v
retrieving revision 1.3
diff -u -p -r1.3 patch-library_tm_tcl
--- patches/patch-library_tm_tcl20 Sep 2013 10:09:08 - 1.3
+++ patches/patch-library_tm_tcl12 Oct 2014 16:43:55 -
@@ -11,8 +11,8 @@ $OpenBSD: patch-library_tm_tcl,v 1.3 201
- ]
+
+# OpenBSD layout
-+add [file join [info library] modules [info tclversion]] \
-+ [file join [file dirname [info library]] modules [info tclversion]]
++add [file join [info library] modules] \
++ [file join [lindex $::tcl_pkgPath 0] modules 85]
if {$tcl_platform(platform) eq windows} {
set sep ;
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 22 Sep 2014 16:54:11 - 1.13
+++ patches/patch-unix_Makefile_in 12 Oct 2014 16:43:55 -
@@ -34,7 +34,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.13
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4
../tcl8/8.4/platform ../tcl8/8.5; \
-+ @for i in opt0.4 http1.0 encoding modules modules/8.5
modules/8.5/platform ../modules/8.5; \
++ @for i in opt0.4 http1.0 encoding modules modules/platform
../modules/85; \
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
@@ -43,7 +43,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.13
done;
@echo Installing package http 2.7.13 as a Tcl Module;
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.13.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/modules/8.5/http-2.7.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/modules/http-2.7.13.tm;
@echo Installing package opt0.4 files to
$(SCRIPT_INSTALL_DIR)/opt0.4/;
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -51,17 +51,17 @@ $OpenBSD: patch-unix_Makefile_in,v 1.13
done;
@echo Installing package msgcat 1.5.2 as a Tcl Module;
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.2.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
$(SCRIPT_INSTALL_DIR)/modules/8.5/msgcat-1.5.2.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
$(SCRIPT_INSTALL_DIR)/modules/msgcat-1.5.2.tm;
@echo Installing package tcltest 2.3.8 as a Tcl Module;
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.8.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
$(SCRIPT_INSTALL_DIR)/modules/8.5/tcltest-2.3.8.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
$(SCRIPT_INSTALL_DIR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/10/10 13:58:21 Modified files: lang/jimtcl: Makefile distinfo lang/jimtcl/patches: patch-examples_ext_Makefile Added files: lang/jimtcl/patches: patch-build-jim-ext_in Log message: Update to 0.75pl2. Use GitHub. Fix build-jim-ext.
Re: MAINTAINER UPDATE: net/tcludp to 1.0.11
On 10/08/14 14:04, Sebastian Reitenbach wrote:
Hi,
an easy update, tested with the only consumer net/coccinella on amd64.
OK?
Hi,
Looking into it, I've come up with this diff.
- HOMEPAGE changed to project page instead of simply a man page with no links
to anywhere.
- Killed the SHARED_LIBS nonsense; it's not needed for these ports. My bad from
lang ago.
- Add TCLUDP_VERSION to SUBST_VARS in an effort to prevent future PLIST churn.
- Man pages will be built if tcllib port is installed but generated man pages
are never installed.
No need to rebuild man pages. Fix with DTPLITE=:.
- Fix freeaddrinfo bug.
I get some test failures with multicast loopback and some inet6 stuff but
otherwise looks ok.
Running the last version's tests against this yields the same result as with
last version.
Stu
Index: Makefile
===
RCS file: /cvs/ports/net/tcludp/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Mar 2013 11:35:57 - 1.8
+++ Makefile9 Oct 2014 12:20:23 -
@@ -4,11 +4,10 @@ SHARED_ONLY = Yes
COMMENT = Tcl UDP extension
-DISTNAME = tcludp-1.0.8
-REVISION = 0
-SHARED_LIBS = udp108 0.0
+V =1.0.11
+DISTNAME = tcludp-${V}
CATEGORIES = net
-HOMEPAGE = http://tcludp.sourceforge.net/
+HOMEPAGE = http://sourceforge.net/projects/tcludp/
MAINTAINER = Sebastian Reitenbach sebas...@openbsd.org
# BSD
@@ -18,6 +17,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
MODULES = lang/tcl
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
+MAKE_FLAGS = DTPLITE=:
FAKE_FLAGS = PKG_DIR=tcludp
SEPARATE_BUILD =Yes
USE_GROFF =Yes
@@ -26,10 +26,12 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR} \
- --datadir=${PREFIX}/share/examples \
- SHLIB_VERSION=${LIBudp108_VERSION} \
- CFLAGS=${CFLAGS} -pthread
+ --datadir=${PREFIX}/share/examples
-TEST_TARGET =test
+WRKDIST = ${WRKDIR}/tcludp
+TEST_TARGET = test
+
+TCLUDP_VERSION =${V:S/.//g}
+SUBST_VARS = TCLUDP_VERSION
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/tcludp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Jul 2010 17:07:25 - 1.1.1.1
+++ distinfo9 Oct 2014 12:20:23 -
@@ -1,5 +1,2 @@
-MD5 (tcludp-1.0.8.tar.gz) = YN06VT/I5Xns/WYiJS2i0g==
-RMD160 (tcludp-1.0.8.tar.gz) = VRRjhyzhthjt0LQRWXM1XdehIYM=
-SHA1 (tcludp-1.0.8.tar.gz) = vZ/M41p1T549+YAm+muAoDtP+oo=
-SHA256 (tcludp-1.0.8.tar.gz) = i6gCrrtsor2I4FwxKCf/Xxa3fulNk1X3fihwEa3iyBk=
-SIZE (tcludp-1.0.8.tar.gz) = 129410
+SHA256 (tcludp-1.0.11.tar.gz) = qKKdVacY65Cq2mQ4QbPgcVIW0nzqLi3yQ+GE7beAqp0=
+SIZE (tcludp-1.0.11.tar.gz) = 147564
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/tcludp/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 5 Jan 2011 18:08:46 - 1.2
+++ patches/patch-configure 9 Oct 2014 12:20:23 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.2 2011/01/05 18:08:46 sebastia Exp $
configure.orig Mon May 15 10:27:16 2006
-+++ configure Fri Dec 17 02:06:17 2010
-@@ -8419,7 +8419,7 @@ echo ${ECHO_T}$tcl_cv_ld_elf 6
- DL_LIBS=
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- echo $as_me:$LINENO: checking for ELF 5
- echo $ECHO_N checking for ELF... $ECHO_C 6
- if test ${tcl_cv_ld_elf+set} = set; then
+--- configure.orig Thu Oct 9 05:40:11 2014
configure Thu Oct 9 05:40:23 2014
+@@ -7173,7 +7173,7 @@ fi
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+ LDFLAGS=-Wl,-export-dynamic
+ ;;
+ esac
Index: patches/patch-generic_udp_tcl_c
===
RCS file: patches/patch-generic_udp_tcl_c
diff -N patches/patch-generic_udp_tcl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-generic_udp_tcl_c 9 Oct 2014 12:20:23 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Nothing to free when getaddrinfo returns error.
+
+--- generic/udp_tcl.c.orig Thu Oct 9 07:23:05 2014
generic/udp_tcl.c Thu Oct 9 07:23:25 2014
+@@ -1315,7 +1315,6 @@ UdpMulticast(UdpState *statePtr, Tcl_Interp *interp,
+
+ if (r != 0 ) {
+
Re: Preventing substitutions in PLIST ?
On 09/26/14 10:46, Stuart Cassoff wrote:
On 09/16/14 21:48, Stuart Cassoff wrote:
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?= 8.5
MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+=MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't currently
have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Another way to do this would be to change the Tcl module
dirs to be like modules/85 instead of modules/8.5, then
the MODTCL_MODPATH stuff wouldn't be needed.
It would be great to get a bit of feedback.
I'd really like to move forward with this.
Stu
Re: MAINTAINER UPDATE: net/tcludp to 1.0.11
On 10/09/14 08:28, Stuart Cassoff wrote:
On 10/08/14 14:04, Sebastian Reitenbach wrote:
Hi,
an easy update, tested with the only consumer net/coccinella on amd64.
OK?
Hi,
Looking into it, I've come up with this diff.
- HOMEPAGE changed to project page instead of simply a man page with no links
to anywhere.
- Killed the SHARED_LIBS nonsense; it's not needed for these ports. My bad
from lang ago.
- Add TCLUDP_VERSION to SUBST_VARS in an effort to prevent future PLIST churn.
- Man pages will be built if tcllib port is installed but generated man pages
are never installed.
No need to rebuild man pages. Fix with DTPLITE=:.
- Fix freeaddrinfo bug.
I get some test failures with multicast loopback and some inet6 stuff but
otherwise looks ok.
Running the last version's tests against this yields the same result as with
last version.
Stu
I don't think we need version numbers in the libs.
Index: Makefile
===
RCS file: /cvs/ports/net/tcludp/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Mar 2013 11:35:57 - 1.8
+++ Makefile9 Oct 2014 20:37:08 -
@@ -4,11 +4,9 @@ SHARED_ONLY = Yes
COMMENT = Tcl UDP extension
-DISTNAME = tcludp-1.0.8
-REVISION = 0
-SHARED_LIBS = udp108 0.0
+DISTNAME = tcludp-1.0.11
CATEGORIES = net
-HOMEPAGE = http://tcludp.sourceforge.net/
+HOMEPAGE = http://sourceforge.net/projects/tcludp/
MAINTAINER = Sebastian Reitenbach sebas...@openbsd.org
# BSD
@@ -18,6 +16,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
MODULES = lang/tcl
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
+MAKE_FLAGS = DTPLITE=:
FAKE_FLAGS = PKG_DIR=tcludp
SEPARATE_BUILD =Yes
USE_GROFF =Yes
@@ -26,10 +25,9 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR} \
- --datadir=${PREFIX}/share/examples \
- SHLIB_VERSION=${LIBudp108_VERSION} \
- CFLAGS=${CFLAGS} -pthread
+ --datadir=${PREFIX}/share/examples
-TEST_TARGET =test
+WRKDIST = ${WRKDIR}/tcludp
+TEST_TARGET = test
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/tcludp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Jul 2010 17:07:25 - 1.1.1.1
+++ distinfo9 Oct 2014 20:37:08 -
@@ -1,5 +1,2 @@
-MD5 (tcludp-1.0.8.tar.gz) = YN06VT/I5Xns/WYiJS2i0g==
-RMD160 (tcludp-1.0.8.tar.gz) = VRRjhyzhthjt0LQRWXM1XdehIYM=
-SHA1 (tcludp-1.0.8.tar.gz) = vZ/M41p1T549+YAm+muAoDtP+oo=
-SHA256 (tcludp-1.0.8.tar.gz) = i6gCrrtsor2I4FwxKCf/Xxa3fulNk1X3fihwEa3iyBk=
-SIZE (tcludp-1.0.8.tar.gz) = 129410
+SHA256 (tcludp-1.0.11.tar.gz) = qKKdVacY65Cq2mQ4QbPgcVIW0nzqLi3yQ+GE7beAqp0=
+SIZE (tcludp-1.0.11.tar.gz) = 147564
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/tcludp/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 5 Jan 2011 18:08:46 - 1.2
+++ patches/patch-configure 9 Oct 2014 20:37:08 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.2 2011/01/05 18:08:46 sebastia Exp $
configure.orig Mon May 15 10:27:16 2006
-+++ configure Fri Dec 17 02:06:17 2010
-@@ -8419,7 +8419,7 @@ echo ${ECHO_T}$tcl_cv_ld_elf 6
- DL_LIBS=
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- echo $as_me:$LINENO: checking for ELF 5
- echo $ECHO_N checking for ELF... $ECHO_C 6
- if test ${tcl_cv_ld_elf+set} = set; then
+--- configure.orig Thu Oct 9 05:40:11 2014
configure Thu Oct 9 05:40:23 2014
+@@ -7173,7 +7173,7 @@ fi
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
++ SHARED_LIB_SUFFIX='.so'
+ LDFLAGS=-Wl,-export-dynamic
+ ;;
+ esac
Index: patches/patch-generic_udp_tcl_c
===
RCS file: patches/patch-generic_udp_tcl_c
diff -N patches/patch-generic_udp_tcl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-generic_udp_tcl_c 9 Oct 2014 20:37:08 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Nothing to free when getaddrinfo returns error.
+
+--- generic/udp_tcl.c.orig Thu Oct 9 07:23:05 2014
generic/udp_tcl.c Thu Oct 9 07:23:25 2014
+@@ -1315,7 +1315,6 @@ UdpMulticast(UdpState *statePtr, Tcl_Interp *interp,
+
+ if (r
NEW: Netinfo
A Tcl extension that provides access to system protocol, service, network, host and ether information which is retrieved from system databases and made available for querying. netinfo-0.6-port.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/30 14:26:38 Modified files: lang/eagle : Makefile distinfo Log message: Update to beta31.
Re: Preventing substitutions in PLIST ?
On 09/16/14 21:48, Stuart Cassoff wrote:
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?= 8.5
MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+= MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't currently
have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Another way to do this would be to change the Tcl module
dirs to be like modules/85 instead of modules/8.5, then
the MODTCL_MODPATH stuff wouldn't be needed.
Re: sguil-0.9.0 on OpenBSD 5,6 current
Moving this discussion to ports. On 09/23/14 20:45, Stan Gammons wrote: I've been trying to get sguil-0.9.0 to work on the Sept 10, 2014 snapshot of OpenBSD 5.6, but I keep getting this error when I try to run sguild # tclsh % package require Tcl 8.6.0 % package require mysqltcl couldn't load file /usr/local/lib/mysqltcl-3.052/libmysqltcl3052.so.1.0: Cannot load specified object % exit I'm curious to see the output of $ ldd libmysqltcl3052.so.1.0 Also, if that's indicative of your layout then you must be adding /usr/lib to your auto_path and that will slow down package loading for you. Attached is a port of mysqltcl, try that instead. Stu mysqltcl-3.052-port.tar.gz Description: application/gzip
Re: REGRESS_* - TEST_*
On 08/31/14 22:54, Stuart Cassoff wrote: On 08/29/14 02:39, Stuart Cassoff wrote: Ever since that change, the var list in bsd.port.mk(5) is no longer in alphabetical order. Stu The test targets as well. Alors?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/22 10:54:11 Modified files: lang/tcl/8.5 : Makefile distinfo lang/tcl/8.5/patches: patch-unix_Makefile_in lang/tcl/8.5/pkg: DESCR PLIST Removed files: lang/tcl/8.5/patches: patch-unix_installManPage Log message: Update to 8.5.16. Drop threaded FLAVOR. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/22 10:55:11 Modified files: x11/tk/8.5 : Makefile distinfo x11/tk/8.5/patches: patch-unix_Makefile_in x11/tk/8.5/pkg : DESCR PLIST Removed files: x11/tk/8.5/patches: patch-unix_installManPage Log message: Update to 8.5.16. Drop threaded FLAVOR. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/22 16:06:49 Modified files: x11/tk/8.5 : distinfo Log message: Upstream updated the distfile about a day after release with MacOSX fixes. Nothing else has changed. Thanks to jasper@ for the heads-up.
Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16
Also remove the threaded FLAVOR; I don't see anything using it.
If threaded Tcl is wanted then 8.6 should be used.
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile11 Jan 2014 12:56:41 - 1.31
+++ Makefile22 Sep 2014 08:07:40 -
@@ -2,10 +2,9 @@
COMMENT = Tool Command Language
-DISTNAME = tcl8.5.15
-PKGNAME = tcl-8.5.15
-REVISION = 2
-SHARED_LIBS = tcl85 1.5
+DISTNAME = tcl8.5.16
+PKGNAME = tcl-8.5.16
+SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -41,14 +40,6 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
EXTRA_INSTALL=install-private-headers \
SHLIB_VERSION=${LIBtcl85_VERSION}
-FLAVORS = threaded
-FLAVOR ?=
-
-.if ${FLAVOR:Mthreaded}
-CONFIGURE_ARGS += --enable-threads
-WANTLIB += pthread
-.endif
-
.include bsd.port.arch.mk
.if ${NO_SHARED_LIBS:L} == no
@@ -66,8 +57,8 @@ TESTHOME =${WRKDIR}/testhome
# Use TESTFLAGS to control the Tcl tests
TESTFLAGS =
-# XXX Until Tcl bug 2911139 is fixed; bug is in test, not in Tcl.
-TESTFLAGS += -skip http-4.14
+# XXX Until Tcl bug 2911139 is fixed; bug is in tests, not in Tcl.
+TESTFLAGS += -skip 'http-4.14 socket-14.14'
pre-test:
mkdir -p ${TESTHOME}
Index: distinfo
===
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo20 Sep 2013 10:09:08 - 1.13
+++ distinfo22 Sep 2014 08:07:40 -
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.15-src.tar.gz) = 8k6q5GF5XmsJv1TH6fON7wJYktpV8mAIwWQTz92iiE4=
-SIZE (tcl8.5.15-src.tar.gz) = 4536117
+SHA256 (tcl8.5.16-src.tar.gz) = omy9sEN9BeWgDJk1cHN+cfpsyQhOGRdNcUCXtcuqwbE=
+SIZE (tcl8.5.16-src.tar.gz) = 4545982
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 20 Sep 2013 10:09:08 - 1.12
+++ patches/patch-unix_Makefile_in 22 Sep 2014 08:07:40 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:09:08 stu Exp $
unix/Makefile.in.orig Fri Nov 9 10:14:39 2012
-+++ unix/Makefile.in Wed Nov 14 07:50:42 2012
-@@ -558,6 +558,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+--- unix/Makefile.in.orig Wed Jul 23 09:03:24 2014
unix/Makefile.in Sun Aug 17 15:22:06 2014
+@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -12,15 +12,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -719,7 +723,6 @@ install-binaries: binaries
+@@ -726,7 +730,6 @@ install-binaries: binaries
done;
@echo Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/
@@INSTALL_LIB@
-- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
+- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
@echo Installing ${TCL_EXE} as
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
- @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
+ @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
@echo Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/
-@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -738,7 +741,7 @@ install-binaries: binaries
+ @EXTRA_INSTALL_BINARIES@
+ @echo Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/
+ @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
+
+ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
+ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
else true; \
fi; \
done;
@@ -29,12 +38,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
-@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
- @echo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/20 11:46:24 Modified files: x11/bwidget: Makefile distinfo Removed files: x11/bwidget/patches: patch-tests_entry_test Log message: Update to 1.9.8.
Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16
I don't think this will be problematic; Tcl is very stable and smooth in the upgrade. k?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/16 09:41:16 Modified files: lang/jimtcl: Makefile distinfo lang/jimtcl/patches: patch-Makefile_in lang/jimtcl/pkg: PLIST Added files: lang/jimtcl/patches: patch-examples_api_Makefile patch-examples_ext_Makefile patch-initjimsh_tcl Log message: Update to 0.75pl1. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/16 09:42:36 Modified files: devel/openocd : Makefile Added files: devel/openocd/patches: patch-src_flash_mflash_c patch-src_helper_command_c patch-src_helper_command_h Log message: Adjust for jimtcl-0.75pl1. Fix bad bound. ok sthen@
Re: UPDATE: Jimtcl and OpenOCD
On 09/14/14 06:04, Stuart Henderson wrote:
On 2014/09/12 17:50, Stuart Cassoff wrote:
I'd like to update the Jimtcl port but that necessitates an update of
OpenOCD.
Your patch doesn't apply cleanly; specifically patch-Makefile_in in jimtcl.
Urgh. Ok, I should have Thunderbird tamed by now. Here they are again, with the
major bump.
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Sep 2014 03:49:27 - 1.8
+++ Makefile16 Sep 2014 14:32:28 -
@@ -4,8 +4,8 @@ SHARED_ONLY = Yes
COMMENT = small footprint implementation of Tcl
-DISTNAME = jimtcl-0.75pl0
-SHARED_LIBS = jim 1.1
+DISTNAME = jimtcl-0.75pl1
+SHARED_LIBS = jim 2.0
CATEGORIES = lang devel
HOMEPAGE = http://jim.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -15,11 +15,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c m sqlite3
-# Git checkin 2013/11/09 fae001d74c06a6293798d6b27db874ff46610a42
+# Git checkin 2014/09/01 c4d4bf8bc104733db1f5992a27d88fbfca9ba882
MASTER_SITES = http://mirror.arieslabs.com/openbsd/
MODULES = lang/tcl
-RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
@@ -31,7 +30,8 @@ MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_
FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
INSTALL_DATA='${INSTALL_DATA}' \
- INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
+ INSTALL_SCRIPT='${INSTALL_SCRIPT}'
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = simple
@@ -41,5 +41,8 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--full \
--with-mod=sqlite3 \
CCACHE=none
+
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/examples.{api,ext}/Makefile
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo14 Nov 2013 09:11:21 - 1.3
+++ distinfo16 Sep 2014 14:32:28 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.75pl0.tar.gz) = hke0AsUyrgKYC86LhjmwIIfw+psdyFyT0oiWECuGUjA=
-SIZE (jimtcl-0.75pl0.tar.gz) = 2217434
+SHA256 (jimtcl-0.75pl1.tar.gz) = P0IpuMohJOHD79LznqEpaVlbligXbJ04z9tcfY2C8TM=
+SIZE (jimtcl-0.75pl1.tar.gz) = 2227650
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 14 Nov 2013 09:11:21 - 1.4
+++ patches/patch-Makefile_in 16 Sep 2014 14:32:28 -
@@ -1,63 +1,50 @@
$OpenBSD: patch-Makefile_in,v 1.4 2013/11/14 09:11:21 stu Exp $
-
-Install everything nicely.
-
Makefile.in.orig Sat Nov 9 00:49:42 2013
-+++ Makefile.inSat Nov 9 10:04:48 2013
-@@ -54,6 +54,12 @@ OBJS := _load-static-exts.o jim-subcmd.o jim-interacti
-
- JIMSH := jimsh@EXEEXT@
+--- Makefile.in.orig Thu Aug 7 21:59:27 2014
Makefile.inThu Sep 4 00:51:06 2014
+@@ -59,6 +59,7 @@ JIMSH := jimsh@EXEEXT@
+ INSTALL_DATA_DIR ?= mkdir -p
+ INSTALL_DATA ?= cp
+ INSTALL_PROGRAM ?= cp
++INSTALL_SCRIPT ?= cp
+ @endif
-+@if JIM_INSTALL
-+INSTALL_DATA_DIR ?= mkdir -p
-+INSTALL_DATA ?= cp
-+INSTALL_PROGRAM ?= cp
-+@endif
-+
all: $(JIMSH) @C_EXT_SHOBJS@
-
- # Create C extensions from pure Tcl extensions
-@@ -66,8 +72,8 @@ docs: Tcl.html
+@@ -73,8 +74,9 @@ docs: Tcl.html
@if JIM_DOCS
install-docs: docs
-- mkdir -p $(DESTDIR)$(prefix)/doc/jim
-- cp Tcl.html $(DESTDIR)$(prefix)/doc/jim
+- $(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/doc/jim
+- $(INSTALL_DATA) Tcl.html $(DESTDIR)$(prefix)/doc/jim
+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jim
-+ $(INSTALL_DATA) @srcdir@/README.extensions Tcl.html
$(DESTDIR)@datadir@/doc/jim
++ $(INSTALL_DATA) @srcdir@/LICENSE @srcdir@/README Tcl.html
$(DESTDIR)@datadir@/doc/jim
++ $(INSTALL_DATA) @srcdir@/README.{extensions,namespaces,oo,sqlite,utf-8}
$(DESTDIR)@datadir@/doc/jim
@else
install-docs:
@endif
-@@ -77,20 +83,21 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+@@ -83,17 +85,22 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+ $(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o
$(LIBJIM) $(LDLIBS) $(LIBS)
@if JIM_INSTALL
- install: all @TCL_EXTS@ install-exec install-docs
-- mkdir -p $(DESTDIR)@libdir@/jim
-- cp $(LIBJIM) $(DESTDIR)@libdir@
-- cp @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@libdir
Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16
These were mangled as well.
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile11 Jan 2014 12:56:41 - 1.31
+++ Makefile16 Sep 2014 14:49:45 -
@@ -2,10 +2,9 @@
COMMENT = Tool Command Language
-DISTNAME = tcl8.5.15
-PKGNAME = tcl-8.5.15
-REVISION = 2
-SHARED_LIBS = tcl85 1.5
+DISTNAME = tcl8.5.16
+PKGNAME = tcl-8.5.16
+SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -66,8 +65,8 @@ TESTHOME =${WRKDIR}/testhome
# Use TESTFLAGS to control the Tcl tests
TESTFLAGS =
-# XXX Until Tcl bug 2911139 is fixed; bug is in test, not in Tcl.
-TESTFLAGS += -skip http-4.14
+# XXX Until Tcl bug 2911139 is fixed; bug is in tests, not in Tcl.
+TESTFLAGS += -skip 'http-4.14 socket-14.14'
pre-test:
mkdir -p ${TESTHOME}
Index: distinfo
===
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo20 Sep 2013 10:09:08 - 1.13
+++ distinfo16 Sep 2014 14:49:45 -
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.15-src.tar.gz) = 8k6q5GF5XmsJv1TH6fON7wJYktpV8mAIwWQTz92iiE4=
-SIZE (tcl8.5.15-src.tar.gz) = 4536117
+SHA256 (tcl8.5.16-src.tar.gz) = omy9sEN9BeWgDJk1cHN+cfpsyQhOGRdNcUCXtcuqwbE=
+SIZE (tcl8.5.16-src.tar.gz) = 4545982
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 20 Sep 2013 10:09:08 - 1.12
+++ patches/patch-unix_Makefile_in 16 Sep 2014 14:49:45 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:09:08 stu Exp $
unix/Makefile.in.orig Fri Nov 9 10:14:39 2012
-+++ unix/Makefile.in Wed Nov 14 07:50:42 2012
-@@ -558,6 +558,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+--- unix/Makefile.in.orig Wed Jul 23 09:03:24 2014
unix/Makefile.in Sun Aug 17 15:22:06 2014
+@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -12,15 +12,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -719,7 +723,6 @@ install-binaries: binaries
+@@ -726,7 +730,6 @@ install-binaries: binaries
done;
@echo Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/
@@INSTALL_LIB@
-- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
+- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
@echo Installing ${TCL_EXE} as
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
- @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
+ @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
@echo Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/
-@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -738,7 +741,7 @@ install-binaries: binaries
+ @EXTRA_INSTALL_BINARIES@
+ @echo Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/
+ @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
+
+ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
+ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
else true; \
fi; \
done;
@@ -29,12 +38,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
-@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
- @echo Installing package http 2.7.12 as a Tcl Module;
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.12.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/modules/8.5/http-2.7.12.tm;
+ @echo Installing package http 2.7.13 as a Tcl Module;
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
Re: UPDATE: Jimtcl and OpenOCD
On 09/16/14 11:18, Stuart Henderson wrote: On 2014/09/16 10:35, Stuart Cassoff wrote: On 09/14/14 06:04, Stuart Henderson wrote: On 2014/09/12 17:50, Stuart Cassoff wrote: I'd like to update the Jimtcl port but that necessitates an update of OpenOCD. Your patch doesn't apply cleanly; specifically patch-Makefile_in in jimtcl. Urgh. Ok, I should have Thunderbird tamed by now. Here they are again, with the major bump. Thanks. OK as far as I can test it, but I don't have a way to test openocd. Great, thanks. I don't see how the newer Jim could be a problem for OpenOCD. If something does go wrong I'll help fix it.
Re: Preventing substitutions in PLIST ?
On 07/11/14 06:22, Stuart Henderson wrote:
On 2014/07/10 23:44, Stuart Cassoff wrote:
eh? meh?
You need a subst variable with the actual path not just the version
number, otherwise you're still going to be hand modifying PLISTs all
over the place.
So something like:
MODTCL_MINVERSION?= 8.5
MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
SUBST_VARS+= MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
It would help clarify things to show a diff with a port that has
been modified to use this method, too.
Here are diffs for everything concerned.
Added missing modtcl vars and did a bit of rearranging in port-modules.5.
Described MODTCL_MINVERSION and MODTCL_MODPATH.
Removed the rest package from tcllib; it needs tDOM which we don't currently
have.
Saves installing 51 directories and 51 pkgIndex.tcl files.
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.183
diff -u -p -r1.183 port-modules.5
--- port-modules.5 13 Sep 2014 16:30:05 - 1.183
+++ port-modules.5 16 Sep 2014 22:47:51 -
@@ -966,15 +966,20 @@ See
.It lang/tcl
Sets
.Ev MODTCL_VERSION ,
+.Ev MODTCL_MINVERSION ,
.Ev MODTCL_BIN ,
.Ev MODTCL_INCDIR ,
+.Ev MODTCL_TCLDIR ,
+.Ev MODTCL_MODDIR ,
.Ev MODTCL_LIBDIR ,
+.Ev MODTCL_CONFIG ,
+.Ev MODTCL_MODPATH ,
.Ev MODTCL_BUILD_DEPENDS ,
.Ev MODTCL_RUN_DEPENDS ,
-.Ev MODTCL_LIB ,
.Ev MODTCL_LIB_DEPENDS ,
+.Ev MODTCL_LIB ,
and
-.Ev MODTCL_CONFIG .
+.Ev MODTCL_WANTLIB .
.Ev MODTCL_VERSION
is the default version used by all Tcl ports and may be overridden.
Provides
@@ -986,6 +991,14 @@ Also affects
.Ev CATEGORIES
and
.Ev SUBST_VARS .
+.Ev MODTCL_MINVERSION
+and
+.Ev MODTCL_MODPATH
+may be used to prevent unwanted
+.Ev MODTCL_VERSION
+or
+.Ev MODTK_VERSION
+substitutions in PLISTs.
.It perl
This module is documented in the main
.Xr bsd.port.mk 5
@@ -1614,12 +1627,13 @@ Sets
.Ev MODTK_BIN ,
.Ev MODTK_INCDIR ,
.Ev MODTK_LIBDIR ,
+.Ev MODTK_CONFIG ,
.Ev MODTK_BUILD_DEPENDS ,
.Ev MODTK_RUN_DEPENDS ,
-.Ev MODTK_LIB ,
.Ev MODTK_LIB_DEPENDS ,
+.Ev MODTK_LIB ,
and
-.Ev MODTK_CONFIG .
+.Ev MODTK_WANTLIB .
.Ev MODTK_VERSION
is the default version used by all Tk ports and
may be overridden.
Index: tcl.port.mk
===
RCS file: /cvs/ports/lang/tcl/tcl.port.mk,v
retrieving revision 1.16
diff -u -p -r1.16 tcl.port.mk
--- tcl.port.mk 17 Nov 2013 11:08:03 - 1.16
+++ tcl.port.mk 16 Sep 2014 22:54:41 -
@@ -3,6 +3,7 @@
CATEGORIES += lang/tcl
MODTCL_VERSION ?= 8.5
+MODTCL_MINVERSION ?= 8.5
.if ${MODTCL_VERSION} == 8.4
_MODTCL_SPEC = tcl-=${MODTCL_VERSION},8.5
@@ -21,6 +22,7 @@ MODTCL_TCLDIR ?= ${LOCALBASE}/lib/tcl
MODTCL_MODDIR ?= ${LOCALBASE}/lib/tcl/modules
MODTCL_LIBDIR ?= ${MODTCL_TCLDIR}/tcl${MODTCL_VERSION}
MODTCL_CONFIG ?= ${MODTCL_LIBDIR}/tclConfig.sh
+MODTCL_MODPATH ?= lib/tcl/modules/${MODTCL_MINVERSION}
MODTCL_BUILD_DEPENDS ?=${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
MODTCL_RUN_DEPENDS ?= ${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
@@ -43,4 +45,4 @@ MODTCL_TCLSH_ADJ =perl -pi \
# Same for 'wish'.
MODTCL_WISH_ADJ = ${MODTCL_TCLSH_ADJ:S/tclsh/wish/}
-SUBST_VARS += MODTCL_VERSION MODTCL_BIN
+SUBST_VARS += MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
Index: tk.port.mk
===
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
retrieving revision 1.12
diff -u -p -r1.12 tk.port.mk
--- tk.port.mk 2 Feb 2013 11:18:28 - 1.12
+++ tk.port.mk 16 Sep 2014 22:54:01 -
@@ -22,7 +22,7 @@ MODTK_LIBDIR ?= ${MODTCL_TCLDIR}/tk${MO
MODTK_CONFIG ?=${MODTK_LIBDIR}/tkConfig.sh
-SUBST_VARS += MODTK_VERSION MODTK_BIN
+SUBST_VARS += MODTCL_MODPATH MODTK_VERSION MODTK_BIN
MODULES += lang/tcl
Index: Makefile
===
RCS file: /cvs/ports/devel/tcllib/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile1 Sep 2014 03:15:22 - 1.22
+++ Makefile17 Sep 2014 01:35:01 -
@@ -3,6 +3,7 @@
COMMENT = Tcl Standard Library
DISTNAME = tcllib-1.16pl0
+REVISION = 0
CATEGORIES = devel lang/tcl
HOMEPAGE = http://sourceforge.net/projects/tcllib/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -27,6 +28,7 @@ do-install:
-nroff-path ${PREFIX}/man/mann \
-example-path ${PREFIX}/share/examples/tcllib \
-app-path ${PREFIX}/share/examples/tcllib/apps \
+ -mp ${PREFIX}/${MODTCL_MODPATH} \
-csb ${PREFIX}/share/doc \
-tclsh ${MODTCL_BIN} \
-descr `cat ${PKGDIR}/DESCR`
Index: patches/patch-installer_tcl
===
RCS
UPDATE: Jimtcl and OpenOCD
I'd like to update the Jimtcl port but that necessitates an update of OpenOCD.
A typedef in Jim had a * removed so it has to be added to OpenOCD in a couple
of places.
I sent similar diffs to the OpenOCD maintainer last week but have yet to hear
from him.
It's a simple change to OpenOCD, and although I'm not sure how to test it,
the build output with the new Jimtcl is the same as with the current Jimtcl.
The Jimtcl update also removes the RUN_DEPENDS on Tcl (Jim doesn't need Tcl),
improves Jim's auto_path and installs more docs and examples.
Fixed a bad bound bug in OpenOCD. OpenOCD shouldn't need Tcl either.
k?
Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Sep 2014 03:49:27 - 1.8
+++ Makefile12 Sep 2014 21:47:20 -
@@ -4,8 +4,8 @@ SHARED_ONLY = Yes
COMMENT = small footprint implementation of Tcl
-DISTNAME = jimtcl-0.75pl0
-SHARED_LIBS = jim 1.1
+DISTNAME = jimtcl-0.75pl1
+SHARED_LIBS = jim 1.2
CATEGORIES = lang devel
HOMEPAGE = http://jim.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -15,11 +15,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c m sqlite3
-# Git checkin 2013/11/09 fae001d74c06a6293798d6b27db874ff46610a42
+# Git checkin 2014/09/01 c4d4bf8bc104733db1f5992a27d88fbfca9ba882
MASTER_SITES = http://mirror.arieslabs.com/openbsd/
MODULES = lang/tcl
-RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
@@ -31,7 +30,8 @@ MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_
FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
INSTALL_DATA='${INSTALL_DATA}' \
- INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
+ INSTALL_SCRIPT='${INSTALL_SCRIPT}'
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = simple
@@ -41,5 +41,8 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--full \
--with-mod=sqlite3 \
CCACHE=none
+
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/examples.{api,ext}/Makefile
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo14 Nov 2013 09:11:21 - 1.3
+++ distinfo12 Sep 2014 21:47:20 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.75pl0.tar.gz) = hke0AsUyrgKYC86LhjmwIIfw+psdyFyT0oiWECuGUjA=
-SIZE (jimtcl-0.75pl0.tar.gz) = 2217434
+SHA256 (jimtcl-0.75pl1.tar.gz) = P0IpuMohJOHD79LznqEpaVlbligXbJ04z9tcfY2C8TM=
+SIZE (jimtcl-0.75pl1.tar.gz) = 2227650
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 14 Nov 2013 09:11:21 - 1.4
+++ patches/patch-Makefile_in 12 Sep 2014 21:47:20 -
@@ -1,63 +1,50 @@
$OpenBSD: patch-Makefile_in,v 1.4 2013/11/14 09:11:21 stu Exp $
-
-Install everything nicely.
-
Makefile.in.orig Sat Nov 9 00:49:42 2013
-+++ Makefile.inSat Nov 9 10:04:48 2013
-@@ -54,6 +54,12 @@ OBJS := _load-static-exts.o jim-subcmd.o jim-interacti
-
- JIMSH := jimsh@EXEEXT@
+--- Makefile.in.orig Thu Aug 7 21:59:27 2014
Makefile.inThu Sep 4 00:51:06 2014
+@@ -59,6 +59,7 @@ JIMSH := jimsh@EXEEXT@
+ INSTALL_DATA_DIR ?= mkdir -p
+ INSTALL_DATA ?= cp
+ INSTALL_PROGRAM ?= cp
++INSTALL_SCRIPT ?= cp
+ @endif
-+@if JIM_INSTALL
-+INSTALL_DATA_DIR ?= mkdir -p
-+INSTALL_DATA ?= cp
-+INSTALL_PROGRAM ?= cp
-+@endif
-+
all: $(JIMSH) @C_EXT_SHOBJS@
-
- # Create C extensions from pure Tcl extensions
-@@ -66,8 +72,8 @@ docs: Tcl.html
+@@ -73,8 +74,9 @@ docs: Tcl.html
@if JIM_DOCS
install-docs: docs
-- mkdir -p $(DESTDIR)$(prefix)/doc/jim
-- cp Tcl.html $(DESTDIR)$(prefix)/doc/jim
+- $(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/doc/jim
+- $(INSTALL_DATA) Tcl.html $(DESTDIR)$(prefix)/doc/jim
+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jim
-+ $(INSTALL_DATA) @srcdir@/README.extensions Tcl.html
$(DESTDIR)@datadir@/doc/jim
++ $(INSTALL_DATA) @srcdir@/LICENSE @srcdir@/README Tcl.html
$(DESTDIR)@datadir@/doc/jim
++ $(INSTALL_DATA) @srcdir@/README.{extensions,namespaces,oo,sqlite,utf-8}
$(DESTDIR)@datadir@/doc/jim
@else
install-docs:
@endif
-@@ -77,20 +83,21 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+@@ -83,17 +85,22 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+ $(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/10 17:09:31 Modified files: devel/tcllib/patches: patch-installer_tcl patch-support_installation_actions_tcl Log message: Make installer work with FAKE_AS_ROOT=no.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/10 17:10:04 Modified files: devel/tklib/patches: patch-installer_tcl patch-support_installation_actions_tcl Log message: Make installer work with FAKE_AS_ROOT=no.
UPDATE: Tcl/Tk 8.5.15 - 8.5.16
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile11 Jan 2014 12:56:41 - 1.31
+++ Makefile8 Sep 2014 15:33:56 -
@@ -2,10 +2,9 @@
COMMENT = Tool Command Language
-DISTNAME = tcl8.5.15
-PKGNAME = tcl-8.5.15
-REVISION = 2
-SHARED_LIBS = tcl85 1.5
+DISTNAME = tcl8.5.16
+PKGNAME = tcl-8.5.16
+SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -66,8 +65,8 @@ TESTHOME =${WRKDIR}/testhome
# Use TESTFLAGS to control the Tcl tests
TESTFLAGS =
-# XXX Until Tcl bug 2911139 is fixed; bug is in test, not in Tcl.
-TESTFLAGS += -skip http-4.14
+# XXX Skip tests that are incompatible with OpenBSD. Tcl bug 2911139.
+TESTFLAGS += -skip 'fCmd-9.4.b http-4.14 socket-14.14'
pre-test:
mkdir -p ${TESTHOME}
Index: distinfo
===
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo20 Sep 2013 10:09:08 - 1.13
+++ distinfo8 Sep 2014 15:33:56 -
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.15-src.tar.gz) = 8k6q5GF5XmsJv1TH6fON7wJYktpV8mAIwWQTz92iiE4=
-SIZE (tcl8.5.15-src.tar.gz) = 4536117
+SHA256 (tcl8.5.16-src.tar.gz) = omy9sEN9BeWgDJk1cHN+cfpsyQhOGRdNcUCXtcuqwbE=
+SIZE (tcl8.5.16-src.tar.gz) = 4545982
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 20 Sep 2013 10:09:08 - 1.12
+++ patches/patch-unix_Makefile_in 8 Sep 2014 15:33:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:09:08 stu Exp $
unix/Makefile.in.orig Fri Nov 9 10:14:39 2012
-+++ unix/Makefile.in Wed Nov 14 07:50:42 2012
-@@ -558,6 +558,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+--- unix/Makefile.in.orig Wed Jul 23 09:03:24 2014
unix/Makefile.in Sun Aug 17 15:22:06 2014
+@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -12,15 +12,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -719,7 +723,6 @@ install-binaries: binaries
+@@ -726,7 +730,6 @@ install-binaries: binaries
done;
@echo Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/
@@INSTALL_LIB@
-- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
+- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
@echo Installing ${TCL_EXE} as
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
- @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
+ @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
@echo Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/
-@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -738,7 +741,7 @@ install-binaries: binaries
+ @EXTRA_INSTALL_BINARIES@
+ @echo Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/
+ @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
+
+ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
+ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
else true; \
fi; \
done;
@@ -29,12 +38,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
-@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
- @echo Installing package http 2.7.12 as a Tcl Module;
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.12.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/modules/8.5/http-2.7.12.tm;
+ @echo Installing package http 2.7.13 as a Tcl Module;
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/07 12:49:13 Modified files: lang/tcl/8.6 : Makefile distinfo lang/tcl/8.6/patches: patch-unix_Makefile_in patch-unix_installManPage lang/tcl/8.6/pkg: PLIST Log message: Update to 8.6.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/07 12:49:32 Modified files: x11/tk/8.6 : Makefile distinfo x11/tk/8.6/patches: patch-unix_Makefile_in patch-unix_installManPage x11/tk/8.6/pkg : PLIST Log message: Update to 8.6.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/07 12:50:07 Modified files: devel/tclthread: Makefile distinfo devel/tclthread/pkg: PLIST Log message: Update to 2.7.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/07 12:50:32 Modified files: databases/tdbc : Makefile distinfo databases/tdbc/patches: patch-tclconfig_tcl_m4 databases/tdbc/pkg: PLIST Log message: Update to 1.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/07 12:50:54 Modified files: databases/tdbc-sqlite3: Makefile distinfo databases/tdbc-sqlite3/pkg: PLIST Log message: Update to 1.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/09/01 15:55:25 Modified files: cad/xcircuit : Makefile distinfo Removed files: cad/xcircuit/patches: patch-files_c Log message: Update to 3.7.57.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/08/31 21:15:22 Modified files: devel/tcllib : Makefile distinfo devel/tcllib/patches: patch-installer_tcl patch-support_installation_actions_tcl devel/tcllib/pkg: PLIST Removed files: devel/tcllib/patches: patch-apps_pt Log message: Update to 1.16pl0.
Re: REGRESS_* - TEST_*
On 08/29/14 02:39, Stuart Cassoff wrote:
Ever since that change, the var list in bsd.port.mk(5) is no longer in
alphabetical order.
Stu
The test targets as well.
Index: bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.404
diff -u -p -r1.404 bsd.port.mk.5
--- bsd.port.mk.5 10 Aug 2014 11:23:02 - 1.404
+++ bsd.port.mk.5 1 Sep 2014 02:52:50 -
@@ -673,26 +673,6 @@ and
so that the packing-list is complete.
.It Ar rebuild
Force rebuild of the port.
-.It Ar test
-Run regression tests for the port.
-Essentially depend on a correct build and invoke
-.Bd -literal
-env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \e
- -f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG}
-.Ed
-.Pp
-If a port needs some other ports installed to run regression tests,
-use
-.Ev TEST_DEPENDS .
-If a port needs special configuration or build options to enable regression
-testing, define a
-.Sq test
-.Ev FLAVOR .
-.It Ar test-depends
-Verify packages needed for regression tests, using the same scheme as
-.Ar build-depends .
-Only invoked when regression tests are run, or explicitly through
-.Ar depends .
.It Ar reinstall
Force reinstallation of a port, by first cleaning the old installation.
Seldom needed, as
@@ -758,6 +738,26 @@ Update an existing installation to a new
like
.Ar update ,
but affects only one single subpackage in multi-packages ports.
+.It Ar test
+Run regression tests for the port.
+Essentially depend on a correct build and invoke
+.Bd -literal
+env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \e
+ -f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG}
+.Ed
+.Pp
+If a port needs some other ports installed to run regression tests,
+use
+.Ev TEST_DEPENDS .
+If a port needs special configuration or build options to enable regression
+testing, define a
+.Sq test
+.Ev FLAVOR .
+.It Ar test-depends
+Verify packages needed for regression tests, using the same scheme as
+.Ar build-depends .
+Only invoked when regression tests are run, or explicitly through
+.Ar depends .
.It Ar unlink-categories
Remove symbolic links in other directories that correspond to the port's
.Ev CATEGORIES .
@@ -2548,41 +2548,6 @@ checksum off
.Pa ftp.openbsd.org ,
in the directory
.Pa /pub/OpenBSD/distfiles/$cipher/$value/$file .
-.It Ev TEST_DEPENDS
-See
-.Ev BUILD_DEPENDS
-for specification.
-Test dependencies are only checked if the test stage is invoked.
-.It Ev TEST_ENV
-Additional environment variables passed to tests.
-Empty by default.
-.It Ev TEST_FLAGS
-Extra flags passed to ${MAKE_PROGRAM} to run the regression tests.
-Empty by default.
-.It Ev TEST_IS_INTERACTIVE
-Set to
-.Sq Yes
-if port needs human interaction to run its tests, or set to
-.Sq X11
-if the tests need an active X11 display to work.
-.It Ev TEST_LOG
-Command used to log the results of regression tests to TEST_LOGFILE.
-.It Ev TEST_LOGFILE
-Log file containing the results of regression tests.
-.It Ev TEST_TARGET
-Target to run regression tests.
-Defaults to
-.Sq regress ,
-except for
-.Sq perl
-and
-.Sq gnu
-.Ev CONFIGURE_STYLE ,
-which default to
-.Sq test
-and
-.Sq check ,
-respectively.
.It Ev REORDER_DEPENDENCIES
Points to a list of files that specify inter-dependencies for
.Xr make 1 .
@@ -2857,6 +2822,41 @@ target.
User settings.
Defaults to
.Pa ${PORTSDIR}/infrastructure/templates .
+.It Ev TEST_DEPENDS
+See
+.Ev BUILD_DEPENDS
+for specification.
+Test dependencies are only checked if the test stage is invoked.
+.It Ev TEST_ENV
+Additional environment variables passed to tests.
+Empty by default.
+.It Ev TEST_FLAGS
+Extra flags passed to ${MAKE_PROGRAM} to run the regression tests.
+Empty by default.
+.It Ev TEST_IS_INTERACTIVE
+Set to
+.Sq Yes
+if port needs human interaction to run its tests, or set to
+.Sq X11
+if the tests need an active X11 display to work.
+.It Ev TEST_LOG
+Command used to log the results of regression tests to TEST_LOGFILE.
+.It Ev TEST_LOGFILE
+Log file containing the results of regression tests.
+.It Ev TEST_TARGET
+Target to run regression tests.
+Defaults to
+.Sq regress ,
+except for
+.Sq perl
+and
+.Sq gnu
+.Ev CONFIGURE_STYLE ,
+which default to
+.Sq test
+and
+.Sq check ,
+respectively.
.It Ev TRUEPREFIX
Read-only.
Mostly the same as ${PREFIX}, except it never gets ${DESTDIR} prepended
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/08/30 11:19:39 Modified files: lang/eagle : Makefile Log message: Adjust for ALL_TEST_ENV.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/08/30 11:16:47 Modified files: devel/nagelfar : Makefile distinfo devel/nagelfar/patches: patch-nagelfar_tcl devel/nagelfar/pkg: PLIST Log message: Update to 1.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/08/30 11:32:34 Modified files: devel/tklib: Makefile distinfo devel/tklib/pkg: PLIST Log message: Update to 0.6pl1.
REGRESS_* - TEST_*
Ever since that change, the var list in bsd.port.mk(5) is no longer in alphabetical order. Stu
Re: Preventing substitutions in PLIST ?
eh? meh?
On 04/16/14 11:07, Stuart Cassoff wrote:
So, is this ok? I think it's ok or very close to ok.
It would be nice to get over this hurdle.
Stu
On 04/09/14 17:58, Stuart Cassoff wrote:
On 12/08/13 09:23, Marc Espie wrote:
On Sun, Dec 08, 2013 at 08:41:23AM -0500, Stuart Cassoff wrote:
On 12/07/13 16:42, Marc Espie wrote:
On Sat, Dec 07, 2013 at 03:39:28PM -0500, Stuart Cassoff wrote:
On 12/05/13 05:36, Marc Espie wrote:
On Thu, Dec 05, 2013 at 01:26:47AM -0500, Stuart Cassoff wrote:
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and
one dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better
and/or faster.
These should always be installend in the dir for lowest tcl version
possible, which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
So, make sure to look at the result of update-plist, it's not always
right.
How's this? Snippet from the port Makefile diff.
+# We want the lowest Tcl version possible.
+MODTK_VERSION =8.5
+
+# Manual target to adjust PLIST after update-plist.
+adj-plist:
+ perl -pi -e 's/\$${MODTK_VERSION}/8.5/' ${PKGDIR}/PLIST
+
YUCK. A big *NO*.
Did you try the approach I outlined ? Namely provide longer module
variables
that would be FIRST in the substituted list.
It confused and frightened me.
Eventually I manned-up and so with your approach I get this in the PLIST:
lib/tcl/${MODTK_MODPATH}/autoscroll-1.1.tm
Which I don't understand much more.
Either way I get the same package file so maybe I don't actually have a
problem here?
Maybe you don't understand it much more, but it's cleaner, in as much
as there's no extra step to fix the plist after update-plist.
... and it will fix the same problem in (potentially) other ports, without
you needing to special-case each and every port.
Ok I understand now, thanks.
How's this? Should there be a MODTK_MINVERSION as well?
Index: lang/tcl/tcl.port.mk
===
RCS file: /cvs/ports/lang/tcl/tcl.port.mk,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 tcl.port.mk
--- lang/tcl/tcl.port.mk 17 Nov 2013 11:08:03 - 1.16
+++ lang/tcl/tcl.port.mk 9 Apr 2014 21:26:05 -
@@ -3,6 +3,7 @@
CATEGORIES += lang/tcl
MODTCL_VERSION ?= 8.5
+MODTCL_MINVERSION ?=8.5
.if ${MODTCL_VERSION} == 8.4
_MODTCL_SPEC = tcl-=${MODTCL_VERSION},8.5
@@ -43,4 +44,4 @@ MODTCL_TCLSH_ADJ = perl -pi \
# Same for 'wish'.
MODTCL_WISH_ADJ = ${MODTCL_TCLSH_ADJ:S/tclsh/wish/}
-SUBST_VARS += MODTCL_VERSION MODTCL_BIN
+SUBST_VARS += MODTCL_MINVERSION MODTCL_VERSION MODTCL_BIN
Index: x11/tk/tk.port.mk
===
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 tk.port.mk
--- x11/tk/tk.port.mk2 Feb 2013 11:18:28 - 1.12
+++ x11/tk/tk.port.mk9 Apr 2014 21:26:55 -
@@ -22,7 +22,7 @@ MODTK_LIBDIR ?=${MODTCL_TCLDIR}/tk${MO
MODTK_CONFIG ?= ${MODTK_LIBDIR}/tkConfig.sh
-SUBST_VARS += MODTK_VERSION MODTK_BIN
+SUBST_VARS += MODTCL_MINVERSION MODTK_VERSION MODTK_BIN
MODULES += lang/tcl
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 port-modules.5
--- port-modules.5 2 Apr 2014 15:00:27 - 1.172
+++ port-modules.5 9 Apr 2014 21:24:27 -
@@ -933,8 +933,9 @@ Sets
.Ev MODTCL_RUN_DEPENDS ,
.Ev MODTCL_LIB ,
.Ev MODTCL_LIB_DEPENDS ,
+.Ev MODTCL_CONFIG
and
-.Ev MODTCL_CONFIG .
+.Ev MODTCL_MINVERSION .
.Ev MODTCL_VERSION
is the default version used by all Tcl ports and may be overridden.
Provides
@@ -946,6 +947,10 @@ Also affects
.Ev CATEGORIES
and
.Ev SUBST_VARS .
+.Ev MODTCL_MINVERSION
+may be used to prevent unwanted
+.Ev MODTCL_VERSION
+substitutions in PLISTs.
.It perl
This module is documented in the main
.Xr bsd.port.mk 5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/05/04 11:33:34 Modified files: lang/eagle : Makefile distinfo Log message: Update to beta30.
Re: Preventing substitutions in PLIST ?
So, is this ok? I think it's ok or very close to ok.
It would be nice to get over this hurdle.
Stu
On 04/09/14 17:58, Stuart Cassoff wrote:
On 12/08/13 09:23, Marc Espie wrote:
On Sun, Dec 08, 2013 at 08:41:23AM -0500, Stuart Cassoff wrote:
On 12/07/13 16:42, Marc Espie wrote:
On Sat, Dec 07, 2013 at 03:39:28PM -0500, Stuart Cassoff wrote:
On 12/05/13 05:36, Marc Espie wrote:
On Thu, Dec 05, 2013 at 01:26:47AM -0500, Stuart Cassoff wrote:
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and
one dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better
and/or faster.
These should always be installend in the dir for lowest tcl version
possible, which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
So, make sure to look at the result of update-plist, it's not always
right.
How's this? Snippet from the port Makefile diff.
+# We want the lowest Tcl version possible.
+MODTK_VERSION =8.5
+
+# Manual target to adjust PLIST after update-plist.
+adj-plist:
+ perl -pi -e 's/\$${MODTK_VERSION}/8.5/' ${PKGDIR}/PLIST
+
YUCK. A big *NO*.
Did you try the approach I outlined ? Namely provide longer module
variables
that would be FIRST in the substituted list.
It confused and frightened me.
Eventually I manned-up and so with your approach I get this in the PLIST:
lib/tcl/${MODTK_MODPATH}/autoscroll-1.1.tm
Which I don't understand much more.
Either way I get the same package file so maybe I don't actually have a
problem here?
Maybe you don't understand it much more, but it's cleaner, in as much
as there's no extra step to fix the plist after update-plist.
... and it will fix the same problem in (potentially) other ports, without
you needing to special-case each and every port.
Ok I understand now, thanks.
How's this? Should there be a MODTK_MINVERSION as well?
Index: lang/tcl/tcl.port.mk
===
RCS file: /cvs/ports/lang/tcl/tcl.port.mk,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 tcl.port.mk
--- lang/tcl/tcl.port.mk 17 Nov 2013 11:08:03 - 1.16
+++ lang/tcl/tcl.port.mk 9 Apr 2014 21:26:05 -
@@ -3,6 +3,7 @@
CATEGORIES +=lang/tcl
MODTCL_VERSION ?=8.5
+MODTCL_MINVERSION ?= 8.5
.if ${MODTCL_VERSION} == 8.4
_MODTCL_SPEC = tcl-=${MODTCL_VERSION},8.5
@@ -43,4 +44,4 @@ MODTCL_TCLSH_ADJ = perl -pi \
# Same for 'wish'.
MODTCL_WISH_ADJ =${MODTCL_TCLSH_ADJ:S/tclsh/wish/}
-SUBST_VARS +=MODTCL_VERSION MODTCL_BIN
+SUBST_VARS +=MODTCL_MINVERSION MODTCL_VERSION MODTCL_BIN
Index: x11/tk/tk.port.mk
===
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 tk.port.mk
--- x11/tk/tk.port.mk 2 Feb 2013 11:18:28 - 1.12
+++ x11/tk/tk.port.mk 9 Apr 2014 21:26:55 -
@@ -22,7 +22,7 @@ MODTK_LIBDIR ?= ${MODTCL_TCLDIR}/tk${MO
MODTK_CONFIG ?= ${MODTK_LIBDIR}/tkConfig.sh
-SUBST_VARS +=MODTK_VERSION MODTK_BIN
+SUBST_VARS +=MODTCL_MINVERSION MODTK_VERSION MODTK_BIN
MODULES += lang/tcl
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 port-modules.5
--- port-modules.52 Apr 2014 15:00:27 - 1.172
+++ port-modules.59 Apr 2014 21:24:27 -
@@ -933,8 +933,9 @@ Sets
.Ev MODTCL_RUN_DEPENDS ,
.Ev MODTCL_LIB ,
.Ev MODTCL_LIB_DEPENDS ,
+.Ev MODTCL_CONFIG
and
-.Ev MODTCL_CONFIG .
+.Ev MODTCL_MINVERSION .
.Ev MODTCL_VERSION
is the default version used by all Tcl ports and may be overridden.
Provides
@@ -946,6 +947,10 @@ Also affects
.Ev CATEGORIES
and
.Ev SUBST_VARS .
+.Ev MODTCL_MINVERSION
+may be used to prevent unwanted
+.Ev MODTCL_VERSION
+substitutions in PLISTs.
.It perl
This module is documented in the main
.Xr bsd.port.mk 5
Re: Preventing substitutions in PLIST ?
On 12/08/13 09:23, Marc Espie wrote:
On Sun, Dec 08, 2013 at 08:41:23AM -0500, Stuart Cassoff wrote:
On 12/07/13 16:42, Marc Espie wrote:
On Sat, Dec 07, 2013 at 03:39:28PM -0500, Stuart Cassoff wrote:
On 12/05/13 05:36, Marc Espie wrote:
On Thu, Dec 05, 2013 at 01:26:47AM -0500, Stuart Cassoff wrote:
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and
one dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better
and/or faster.
These should always be installend in the dir for lowest tcl version
possible, which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
So, make sure to look at the result of update-plist, it's not always
right.
How's this? Snippet from the port Makefile diff.
+# We want the lowest Tcl version possible.
+MODTK_VERSION =8.5
+
+# Manual target to adjust PLIST after update-plist.
+adj-plist:
+ perl -pi -e 's/\$${MODTK_VERSION}/8.5/' ${PKGDIR}/PLIST
+
YUCK. A big *NO*.
Did you try the approach I outlined ? Namely provide longer module
variables
that would be FIRST in the substituted list.
It confused and frightened me.
Eventually I manned-up and so with your approach I get this in the PLIST:
lib/tcl/${MODTK_MODPATH}/autoscroll-1.1.tm
Which I don't understand much more.
Either way I get the same package file so maybe I don't actually have a
problem here?
Maybe you don't understand it much more, but it's cleaner, in as much
as there's no extra step to fix the plist after update-plist.
... and it will fix the same problem in (potentially) other ports, without
you needing to special-case each and every port.
Ok I understand now, thanks.
How's this? Should there be a MODTK_MINVERSION as well?
Index: lang/tcl/tcl.port.mk
===
RCS file: /cvs/ports/lang/tcl/tcl.port.mk,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 tcl.port.mk
--- lang/tcl/tcl.port.mk17 Nov 2013 11:08:03 - 1.16
+++ lang/tcl/tcl.port.mk9 Apr 2014 21:26:05 -
@@ -3,6 +3,7 @@
CATEGORIES += lang/tcl
MODTCL_VERSION ?= 8.5
+MODTCL_MINVERSION ?= 8.5
.if ${MODTCL_VERSION} == 8.4
_MODTCL_SPEC = tcl-=${MODTCL_VERSION},8.5
@@ -43,4 +44,4 @@ MODTCL_TCLSH_ADJ =perl -pi \
# Same for 'wish'.
MODTCL_WISH_ADJ = ${MODTCL_TCLSH_ADJ:S/tclsh/wish/}
-SUBST_VARS += MODTCL_VERSION MODTCL_BIN
+SUBST_VARS += MODTCL_MINVERSION MODTCL_VERSION MODTCL_BIN
Index: x11/tk/tk.port.mk
===
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 tk.port.mk
--- x11/tk/tk.port.mk 2 Feb 2013 11:18:28 - 1.12
+++ x11/tk/tk.port.mk 9 Apr 2014 21:26:55 -
@@ -22,7 +22,7 @@ MODTK_LIBDIR ?= ${MODTCL_TCLDIR}/tk${MO
MODTK_CONFIG ?=${MODTK_LIBDIR}/tkConfig.sh
-SUBST_VARS += MODTK_VERSION MODTK_BIN
+SUBST_VARS += MODTCL_MINVERSION MODTK_VERSION MODTK_BIN
MODULES += lang/tcl
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 port-modules.5
--- port-modules.5 2 Apr 2014 15:00:27 - 1.172
+++ port-modules.5 9 Apr 2014 21:24:27 -
@@ -933,8 +933,9 @@ Sets
.Ev MODTCL_RUN_DEPENDS ,
.Ev MODTCL_LIB ,
.Ev MODTCL_LIB_DEPENDS ,
+.Ev MODTCL_CONFIG
and
-.Ev MODTCL_CONFIG .
+.Ev MODTCL_MINVERSION .
.Ev MODTCL_VERSION
is the default version used by all Tcl ports and may be overridden.
Provides
@@ -946,6 +947,10 @@ Also affects
.Ev CATEGORIES
and
.Ev SUBST_VARS .
+.Ev MODTCL_MINVERSION
+may be used to prevent unwanted
+.Ev MODTCL_VERSION
+substitutions in PLISTs.
.It perl
This module is documented in the main
.Xr bsd.port.mk 5
Re: UPDATE: Scratch
On 03/26/14 18:44, Stuart Cassoff wrote: This update of Scratch needs the new Squeak. Port tarball supplied though diff not that bad. No need to build any plugins; all needed plugins available via the vm port. Adding a dependency on Squeak sources v2 and installing changes file allows users to modify Scratch. Removed homegrown startup script. The supplied startup script is now installed. May need modification. Ports var adjustments for better(?) PLIST. There are some hard-coded directories (like /usr/share) in the Scratch image and aiui changes cannot be automated. If adjusted then all available languages would appear in the language menu and the Examples button in the file dialog would go to the installed examples. Other problems, if any, can be fixed as well. Some person would have to make the changes manually and then repackage the distfile. Stu Here's a changeset and insructions for altering the hardcoded directories. The third thing this gives is the help screens for the individual Scratch blocks. Stu scratchadj.tar.gz Description: application/gzip
NEW: Ports system.
It's taken a while but I'm pleased to announce a new ports framework written entirely in Tcl! It functions identically to the existing system but is in some ways improved. Most important has been the move from perl to Tcl. This should help 'open up' the ports system as Tcl provides a lower bar to entry for those interested in working on the ports system. The code is smaller, better documented, runs faster and has an overall smoother feel. * Completely i18n, the current languages are English, Spanish, German and Italian. * Tight integration with Sqlite and Fossil. * Very modern looking Tk frontend. * Simple textfile-based configuration. * Built from ports already existing in the ports tree. * Understands and can install some non-compiled (docs, script, etc.) packages from FreeBSD, NetBSD and Debian. Other systems (Mandriva, CentOS) support is in the works. * Converting function can convert a FreeBSD port to an OpenBSD port. Conversions from other systems are in the works. * Easy reinsert function allows sliding out a port from under its dependencies and replacing it, avoiding a mass reinstall. * Cataloger function allows easy browsing of all docs/images/movies/etc. in the ports tree. * CFLAGS et al cross reference. * Insta-port function creates port skeleton from url or directory contents. This doesn't work as well as I'd hoped so I'll probably remove it. * Snapshot function allows freezing a set of ports in time while permitting the updates of all others. Also allows simple and full duplication of machine setup wrt ports. * Facebook and Twitter interfaces allow dpb monitoring via social media. * Experimental gpio interface for providing more immediate visual/audio feedback from the ports system. * Set of example advanced port templates are provided, covering a few styles of autoconf and cmake setups. Should make it easier to start a new port. * Fully mandoc documented. * Test suite (214 tests so far). * Open source license. Available on bitbucket (pronounced 'bouquet') rsn. Stu
Re: UPDATE: Scratch
On 03/27/14 10:46, Fred wrote: On 03/26/14 22:44, Stuart Cassoff wrote: This update of Scratch needs the new Squeak. Port tarball supplied though diff not that bad. No need to build any plugins; all needed plugins available via the vm port. Adding a dependency on Squeak sources v2 and installing changes file allows users to modify Scratch. Removed homegrown startup script. The supplied startup script is now installed. May need modification. Ports var adjustments for better(?) PLIST. There are some hard-coded directories (like /usr/share) in the Scratch image and aiui changes cannot be automated. If adjusted then all available languages would appear in the language menu and the Examples button in the file dialog would go to the installed examples. Other problems, if any, can be fixed as well. Some person would have to make the changes manually and then repackage the distfile. Stu Hi Stu, Lightly tested on amd64 - using the new squeakvm that you posted. Will try to test i386 and macppc in the next week (I'm away this weekend). When starting scratch I have to do: SC_DIR=/usr/local/share/scratch/ scratch other wise it says: port:fred /var/www scratch Executing: /usr/local/lib/squeak/squeakvm/squeakvm /Scratch.image Could not open the Squeak image file `/Scratch.image'. There are three ways to open a Squeak image file. You can: 1. Put copies of the default image and changes files in this directory. 2. Put the name of the image file on the command line when you run squeak (use the `-help' option for more information). 3. Set the environment variable SQUEAK_IMAGE to the name of the image that you want to use by default. For more information, type: `man squeak' (without the quote characters). Thanks for the update, cheers Fred Great, thanks! Hm, the startup script needs adjusting. You can skip it and run the vm directly. Stu
Re: tedu asp2php
On 03/26/14 10:22, Stuart Henderson wrote: asp2php is a program which converts Microsoft's ASP code to PHP. It supports multiple database drivers, sessions, both PHP3 and PHP4, and also provides a graphical front end to do all this. I don't think a program that hasn't been updated since 2006 that converts Microsoft ASP to PHP3/4 is going to produce anything that should be run on a webserver today. OK to zap it? Please no! I'm using it in a mission-critical situation.
UPDATE: Squeak
Many changes and some new things. Port tarball supplied. It's still diffable, but ... I don't think the port was well structured for Squeak nor do I think that what I have currently is either but at least all the pieces are together and we can work with them. I started trying to make the diffs as small as possible but after a while it didn't make sense. Everything still needs work and could be more consistent. Assorted info can be be found in Makefile comments, patches and other ports files. Smalltalk: I'm sure you all know this but it's good for me to make a note and might help explain the decisions taken: To do things in Smalltalk one needs at least a vm and an image file. A vm is a bytecode interpreter, an image is an object memory snapshot. A changes file normally accompanies an image file but is optional. A sources file contains all the source code that was used to generate the image, initially. A changes file contains all the source code and change info since the end of (time of) the sources file. Sources files are expected to be found in the same dir as the image file or the same dir as the vm and are considered read-only. An image has an internal reference to (wants) a particular sources file. One sources file can be used by many images. It is possible to use an image without a sources file: Squeak can reconstruct source code but variable names, comments, etc. will be missing. Likewise with a changes file. In order to do any work, an image and changes files are required. Images and corresponding changes files are expected to be in the same directory and writeable. Summary: vm's don't need anything, images need sources and changes, and a vm to run on. Ports: There are many images now, a few sources files and one vm. The vm is the latest that can be easily obtained and of fairly recent vintage. Versioning from Squeak doesn't make sense: we have 3.10 and 4.5. Distfiles now go in simply distfiles/squeak. Lots of port var changes with corresponding better(?) PLISTs. Dependencies are changed: Images depend on sources, sources depend on vm. The directory names for the various images and sources ports are probably wrong. Categories? All sources and vm files are installed in the vm dir (lib/squeak/squeakvm). All image and changes files are installed in the Squeak dir (lib/squeak). Vm: The Squeak vm now uses cmake. Almost all the old patches are no longer relevant. New patches! I did up a MIDI driver and a Sndio driver. The MIDI driver is untested (how to test?). The Sndio driver is simple and plays sound but iiuc needs to work asynchronously. UUIDPlugin is disable becaused it needs work and I wanted to test how to disable a plugin. port-lib-depends check is ok but I don't think the dependencies are right. The vm dir is overridden so the sources ports know where to put the sources files. Vm docs needs work. I've found it easy to work by installing everything then copying everything from the vm dir and all the images and changes files to one dir, making the images and changes writeable. There are some scripts in the st/ dir that do things with sound. $ squeak imagename [scriptname] Or run squeakvm directly. $ ./squeakvm imagename bachFugue.st If asked at any point, choose aDefaultSoundSystem. The Score Player can output to MIDI, check the menu. In the vm build dir, doing: $ make DESTDIR=plop install will yield all the needed vm files in one place for easy copying. Along with the above mess of verbiage, you get: Vm*: 4.10.2.2614 Sources: V2, V3.9*, V4.1 Smalltalk images: Squeak 3.10*, Squeak 4.5, Cuis, Pharo But wait, there's more images! funsqueak* - old variety image muo - musical objects sbe - squeak by example (image and book) seaside - web server framework *already in the existing Squeak port It would be nice to have a newer version of Pharo but that requires a Cog vm and we only have an Interpreter vm. A trial build of the Cog vm revealed that we don't have ucontext.h which it seems to want, looks deprecated and will probaly never show up in OpenBSD so I stopped there for now. I think that the Cog vm is important. More things will need it. Muo wants CSound (which we don't have), and other audio/music stuff. I probably forgot something, Stu nsqueak7.tar.gz Description: application/gzip
UPDATE: Scratch
This update of Scratch needs the new Squeak. Port tarball supplied though diff not that bad. No need to build any plugins; all needed plugins available via the vm port. Adding a dependency on Squeak sources v2 and installing changes file allows users to modify Scratch. Removed homegrown startup script. The supplied startup script is now installed. May need modification. Ports var adjustments for better(?) PLIST. There are some hard-coded directories (like /usr/share) in the Scratch image and aiui changes cannot be automated. If adjusted then all available languages would appear in the language menu and the Examples button in the file dialog would go to the installed examples. Other problems, if any, can be fixed as well. Some person would have to make the changes manually and then repackage the distfile. Stu nscratch2.tar.gz Description: application/gzip
Re: UPDATE: Squeak
On 03/26/14 18:43, Stuart Cassoff wrote: It would be nice to have a newer version of Pharo but that requires a Cog vm and we only have an Interpreter vm. A trial build of the Cog vm revealed that we don't have ucontext.h which it seems to want, looks deprecated and will probaly never show up in OpenBSD so I stopped there for now. I think that the Cog vm is important. More things will need it. Baby steps. I'm starting to understand. I just now managed to build a working Cog 'stack vm' and I can run Pharo 2 and 3 with it as well as Squeak. A simple matter of configure options and reading documentation. :p So we should be able to have more than one vm now, which brings its own set of problems like where should the sources go. Stu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/03/14 16:08:41 Modified files: lang/eagle : Makefile distinfo Log message: Update to beta29.
Re: Scratch crashing by audio events
I've got a WIP of the latest Squeak with an embryo of a sndio driver. I'll clean it up and post it here soon. Stu On 03/05/14 05:55, Alexandre Ratchov wrote: On Tue, Mar 04, 2014 at 03:17:17PM +0200, Lars Engblom wrote: Yesterday I installed Scratch (from latest snapshot). Everything I tested worked, except for audio playback which causes a core-dump. I think this problem has been since last year and discussed earlier on the list. If I remember right, the problem is in Squeek. Is there anything that could be done? sure, I could fix the audio bits; It would easier if someone handles the autotools changes and gives me a simple receipe to quickly edit-compile-test, this is the part where i spend most of the time unfortunately. -- Alexandre
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/02/11 00:49:58 Modified files: lang/squeak/vm : Makefile Log message: Quick fix for gnu-interp not working with pie. ok espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/02/09 05:26:00 Modified files: x11/tkcon : Makefile x11/tkcon/pkg : PLIST Log message: Fix conflict; rename conflicting file. ok espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/02/09 05:27:05 Modified files: devel/tcllib : Makefile devel/tcllib/pkg: PLIST Log message: Conflict resolved in TkCon.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/02/08 00:41:41 Modified files: cad/xcircuit : Makefile Added files: cad/xcircuit/patches: patch-files_c Log message: Fix bad bound. Thanks to naddy@ for the heads-up.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/12/29 01:08:53 Modified files: cad/xcircuit : Makefile distinfo Log message: Update to 3.7.55.
Re: Preventing substitutions in PLIST ?
On 12/07/13 16:42, Marc Espie wrote:
On Sat, Dec 07, 2013 at 03:39:28PM -0500, Stuart Cassoff wrote:
On 12/05/13 05:36, Marc Espie wrote:
On Thu, Dec 05, 2013 at 01:26:47AM -0500, Stuart Cassoff wrote:
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and one
dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better and/or
faster.
These should always be installend in the dir for lowest tcl version
possible, which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
So, make sure to look at the result of update-plist, it's not always
right.
How's this? Snippet from the port Makefile diff.
+# We want the lowest Tcl version possible.
+MODTK_VERSION =8.5
+
+# Manual target to adjust PLIST after update-plist.
+adj-plist:
+ perl -pi -e 's/\$${MODTK_VERSION}/8.5/' ${PKGDIR}/PLIST
+
YUCK. A big *NO*.
Did you try the approach I outlined ? Namely provide longer module variables
that would be FIRST in the substituted list.
It confused and frightened me.
Eventually I manned-up and so with your approach I get this in the PLIST:
lib/tcl/${MODTK_MODPATH}/autoscroll-1.1.tm
Which I don't understand much more.
Either way I get the same package file so maybe I don't actually have a problem
here?
Stu
Re: Preventing substitutions in PLIST ?
On 12/05/13 05:36, Marc Espie wrote:
On Thu, Dec 05, 2013 at 01:26:47AM -0500, Stuart Cassoff wrote:
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and one
dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better and/or
faster.
These should always be installend in the dir for lowest tcl version
possible, which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
So, make sure to look at the result of update-plist, it's not always
right.
How's this? Snippet from the port Makefile diff.
+# We want the lowest Tcl version possible.
+MODTK_VERSION =8.5
+
+# Manual target to adjust PLIST after update-plist.
+adj-plist:
+ perl -pi -e 's/\$${MODTK_VERSION}/8.5/' ${PKGDIR}/PLIST
+
Preventing substitutions in PLIST ?
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and one dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better and/or
faster.
These should always be installend in the dir for lowest tcl version possible,
which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
--- /usr/ports/devel/tklib/pkg/PLISTSat Nov 16 16:26:47 2013
+++ PLIST Thu Dec 5 00:09:14 2013
@@ -3,9 +3,6 @@
@conflict wcb-*
@pkgpath devel/mentry
@pkgpath devel/wcb
-lib/tcl/autoscroll/
-lib/tcl/autoscroll/autoscroll.tcl
-lib/tcl/autoscroll/pkgIndex.tcl
lib/tcl/canvas/
lib/tcl/canvas/canvas_drag.tcl
lib/tcl/canvas/canvas_epoints.tcl
@@ -101,6 +98,7 @@
lib/tcl/menubar/node.tcl
lib/tcl/menubar/pkgIndex.tcl
lib/tcl/menubar/tree.tcl
+lib/tcl/modules/${MODTK_VERSION}/autoscroll-1.1.tm
lib/tcl/ntext/
lib/tcl/ntext/ntext.tcl
lib/tcl/ntext/pkgIndex.tcl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/29 11:41:53 Log message: Import devel/ltcltk, ok stsp@ A binding of the Tcl interpreter to Lua. It allows for calls into Tcl, setting and reading variables from Tcl and registering of Lua functions for use from Tcl. Also, a binding to the Tk toolit is included. Status: Vendor Tag: stu Release Tags: stu_20131129 N ports/devel/ltcltk/Makefile N ports/devel/ltcltk/distinfo N ports/devel/ltcltk/pkg/DESCR N ports/devel/ltcltk/pkg/PLIST N ports/devel/ltcltk/pkg/PFRAG.shared N ports/devel/ltcltk/patches/patch-ltcl_c No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/29 11:43:57 Modified files: devel : Makefile Log message: +ltcltk
Re: NEW: ltcltk
Not the most exciting port, I know. But I do actually use it. Stu On 11/18/13 14:05, Stuart Cassoff wrote: A binding of the Tcl interpreter to Lua. It allows for calls into Tcl, setting and reading variables from Tcl and registering of Lua functions for use from Tcl. Also, a binding to the Tk toolit is included. Stu
Re: NEW: ltcltk
On 11/29/13 11:47, Stefan Sperling wrote: On Fri, Nov 29, 2013 at 11:27:09AM -0500, Stuart Cassoff wrote: Not the most exciting port, I know. But I do actually use it. Stu Looks fine to me, except I would probably use 'post-patch' instead of 'do-configure' to tweak the shebang lines. It doesn't matter in this case, but in some cases doing the shebang tweaks in post-patch can mess up things for update-patches. Perhaps we could fix the provided Makefile and submit a patch upstream, instead of having do-build? Aside from the patch, there are some other bits I plan on sending upstream so I'll see what I can do with the Makefile while I'm at it. I don't think these are blocking issues for importing it, so ok. Great, thanks! Stu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/28 08:25:51 Modified files: databases/sqlite3: Makefile distinfo databases/sqlite3/patches: patch-Makefile_in patch-src_sqliteInt_h Log message: Update to 3.8.0.2. ok espie@
Re: NEW-ish: sqlite3-tcl
On 07/09/13 10:44, Stuart Cassoff wrote:
An individual port of the Tcl Sqlite bindings.
I think I get it now.
Stu
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 Makefile
--- Makefile21 Mar 2013 08:45:14 - 1.71
+++ Makefile28 Nov 2013 05:37:31 -
@@ -3,8 +3,8 @@
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
-V= 3.7.15.2
-DISTNAME= sqlite-src-3071502
+V= 3.8.0.2
+DISTNAME = sqlite-src-3080002
EXTRACT_SUFX = .zip
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
@@ -13,7 +13,7 @@ CATEGORIES= databases
IGNORE-main = --${FULLPKGNAME-main} comes with OpenBSD as of release 5.2
SUBPACKAGE ?= -lemon
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES = ${HOMEPAGE}2013/
HOMEPAGE= http://www.sqlite.org/
Index: distinfo
===
RCS file: /cvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo18 Mar 2013 10:58:16 - 1.37
+++ distinfo28 Nov 2013 05:37:31 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite-src-3071502.zip) = pEs4yu2Z+VONB6atQX1WLJlBbsD3mtKdXmCtaaiGbYc=
-SIZE (sqlite-src-3071502.zip) = 5005498
+SHA256 (sqlite-src-3080002.zip) = yTo4uIKED5DhWs89htS65mRiw2CQj12iiA8/u8tCwMI=
+SIZE (sqlite-src-3080002.zip) = 5363492
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-Makefile_in
--- patches/patch-Makefile_in 18 Mar 2013 10:58:16 - 1.22
+++ patches/patch-Makefile_in 28 Nov 2013 05:37:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.22 2013/03/18 10:58:16 espie Exp $
Makefile.in.orig Wed Jan 9 14:51:48 2013
-+++ Makefile.inMon Mar 18 11:53:00 2013
-@@ -187,7 +187,7 @@ LIBOBJS1 = sqlite3.lo
+--- Makefile.in.orig Tue Sep 3 13:26:17 2013
Makefile.inWed Nov 27 23:14:02 2013
+@@ -188,7 +188,7 @@ LIBOBJS1 = sqlite3.lo
# Determine the real value of LIBOBJ based on the 'configure' script
#
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
# All of the source code files.
-@@ -282,6 +282,8 @@ SRC = \
+@@ -283,6 +283,8 @@ SRC = \
$(TOP)/src/walker.c \
$(TOP)/src/where.c
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
# Source code for extensions
#
SRC += \
-@@ -476,7 +478,7 @@ EXTHDR += \
+@@ -491,7 +493,7 @@ EXTHDR += \
# This is the default Makefile target. The objects listed here
# are what get build when you type just make with no arguments.
#
@@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
Makefile: $(TOP)/Makefile.in
./config.status
-@@ -488,9 +490,9 @@ libsqlite3.la: $(LIBOBJ)
+@@ -503,9 +505,9 @@ libsqlite3.la: $(LIBOBJ)
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
${ALLOWRELEASE} -rpath $(libdir) -version-info 8:6:8
@@ -40,7 +40,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
-rpath $(TCLLIBDIR) \
-version-info 8:6:8 \
-avoid-version
-@@ -772,6 +774,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
+@@ -793,6 +795,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite-shell.lo \
libsqlite3.la $(LIBTCL)
@@ -50,7 +50,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
# Rules to build opcodes.c and opcodes.h
#
opcodes.c:opcodes.h $(TOP)/mkopcodec.awk
-@@ -792,8 +797,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
+@@ -813,8 +818,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp parse.h
sqlite3.h:$(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
@@ -65,16 +65,16 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
keywordhash.h:$(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS)
$(TOP)/tool/mkkeywordhash.c
./mkkeywordhash$(BEXE) keywordhash.h
-@@ -875,7 +884,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
+@@ -899,7 +908,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
TESTFIXTURE_FLAGS += -DBUILD_sqlite
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
-TESTFIXTURE_SRC1 = sqlite3.c
+TESTFIXTURE_SRC1 = sqlite3.c $(TOP)/src/pthread_stub.c
- TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TESTFIXTURE_SRC$(USE_AMALGAMATION))
+ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
+ TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
- testfixture$(TEXE): $(TESTFIXTURE_SRC)
-@@ -912,18 +921,12 @@ lib_install: libsqlite3.la
+@@ -937,18 +946,12 @@ lib_install: libsqlite3.la
$(INSTALL) -d
Re: NEW-ish: sqlite3-tcl
On 11/19/13 08:38, Stuart Cassoff wrote: On 07/09/13 10:44, Stuart Cassoff wrote: An individual port of the Tcl Sqlite bindings. For when/if the sqlite3 port is removed. Latest version. Lemon port. Tdbc-sqlite update. Haha! I was under the mistaken impression that there was an intention to remove the sqlite3 port since it's now in base. I'd still like to split off sqlite3-tcl as its own port. This would make it easier to keep sqlite3-tcl synced with the base sqlite3 and turn it into a separate port like all the other sqlite3 bindings ports. I had a go at updating the sqlite3 port but things seem to have changed on the sqlite3 site as far as the source goes, but now tcl-sqlite3 is easier to download and build, another argument for splitting off the port. Stu
Re: NEW-ish: sqlite3-tcl
On 07/09/13 10:44, Stuart Cassoff wrote:
An individual port of the Tcl Sqlite bindings.
For when/if the sqlite3 port is removed.
Latest version.
Lemon port.
Tdbc-sqlite update.
I redid the tdbc-sqlite install because I already
had to do fix the manpage, it's only a couple of files
and doesn't need any special prep and there's really no
need for all the configure stuff.
Stu
Index: Makefile
===
RCS file: /cvs/ports/databases/tdbc-sqlite3/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile11 Mar 2013 02:52:09 - 1.2
+++ Makefile19 Nov 2013 13:26:09 -
@@ -2,8 +2,10 @@
COMMENT = sqlite3 module for TDBC
-DISTNAME = tdbcsqlite3-1.0.0
-PKGNAME = tdbc-sqlite3-1.0.0
+V =1.0.0
+DISTNAME = tdbcsqlite3-${V}
+PKGNAME = tdbc-sqlite3-${V}
+REVISION = 0
CATEGORIES = databases
HOMEPAGE = http://tdbc.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -22,20 +24,27 @@ BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS} \
databases/tdbc \
- databases/sqlite3,-tcl
+ databases/sqlite3-tcl
-TEST_DEPENDS = databases/sqlite3,-tcl
-FAKE_FLAGS = tmdir=${MODTCL_MODDIR}/${MODTCL_VERSION}
-SEPARATE_BUILD = Yes
+TEST_DEPENDS = databases/sqlite3-tcl
USE_GROFF =Yes
-CONFIGURE_STYLE = gnu
+NO_BUILD = Yes
-CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
- --with-tcl=${MODTCL_LIBDIR} \
- --libdir=${MODTCL_TCLDIR} \
- --with-tdbc=${MODTCL_TCLDIR}/tdbc
+TD_MODDIR =${${DESTDIRNAME}}${MODTCL_MODDIR}/${MODTCL_VERSION}/tdbc
+TD_MANFILE = ${PREFIX}/man/mann/tdbc::sqlite3.n
-TEST_TARGET = test
-NO_BUILD = Yes
+# Install and fix man page
+do-install:
+ ${INSTALL_DATA_DIR} ${TD_MODDIR}
+ ${INSTALL_DATA} ${WRKSRC}/library/tdbcsqlite3.tcl \
+ ${TD_MODDIR}/sqlite3-${V}.tm
+ grep '^.TH' ${WRKSRC}/doc/tdbc_sqlite3.n ${TD_MANFILE}
+ grep -v '^.TH' ${WRKSRC}/doc/tdbc_sqlite3.n ${TD_MANFILE}
+ chmod ${MANMODE} ${TD_MANFILE}
+ chown ${MANOWN}:${MANGRP} ${TD_MANFILE}
+
+do-test:
+ ${MODTCL_BIN} ${WRKSRC}/tests/all.tcl \
+ -load 'source ${WRKSRC}/library/tdbcsqlite3.tcl'
.include bsd.port.mk
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/tdbc-sqlite3/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Feb 2013 05:24:08 - 1.1.1.1
+++ pkg/PLIST 19 Nov 2013 13:26:09 -
@@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/02/07 05:24:08 stu Exp $
lib/tcl/modules/${MODTCL_VERSION}/tdbc/
lib/tcl/modules/${MODTCL_VERSION}/tdbc/sqlite3-1.0.0.tm
-@man man/mann/tdbc_sqlite3.n
+@man man/mann/tdbc::sqlite3.n
sqlite3-tcl-3.8.0.2-port.tar.gz
Description: application/gzip
lemon-3.8.0.2-port.tar.gz
Description: application/gzip
NEW: ltcltk
A binding of the Tcl interpreter to Lua. It allows for calls into Tcl, setting and reading variables from Tcl and registering of Lua functions for use from Tcl. Also, a binding to the Tk toolit is included. Stu ltcltk-0.9_2-port.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/14 02:11:21 Modified files: lang/jimtcl: Makefile distinfo lang/jimtcl/patches: patch-Makefile_in lang/jimtcl/pkg: PLIST Removed files: lang/jimtcl/patches: patch-autosetup_cc-shared_tcl Log message: Update to 0.75. Gmake not needed. Put include files in their own dir. Install examples. Install loadable sqlite3 extension. Take maintainership with permission. Thanks to Steve Havelka for distfile hosting. ok landry@; thanks sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/14 02:12:29 Modified files: devel/openocd : Makefile Log message: Adjust for libftdi and newer jimtcl. ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/14 02:21:18 Modified files: devel/tcllib : Makefile distinfo devel/tcllib/patches: patch-examples_tepam_tepam_demo_tcl patch-installer_tcl devel/tcllib/pkg: DESCR PLIST Added files: devel/tcllib/patches: patch-apps_pt patch-support_installation_actions_tcl patch-support_installation_modules_tcl Removed files: devel/tcllib/files: mkindex.tcl devel/tcllib/patches: patch-support_devel_all_tcl patch-support_devel_sak_test_run_tcl Log message: Update to 1.15. Some stuff went upstream. Instead of doing all that ridiculous work in the Makefile, I've moved it all to Tcllib's installer itself. This should make future updates a lot less painful. Thanks to Steve Havelka for distfile hosting. ok landry@; thanks zhuk@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/14 02:43:09 Modified files: devel/tklib: Makefile distinfo devel/tklib/patches: patch-installer_tcl devel/tklib/pkg: PLIST Added files: devel/tklib/patches: patch-apps_bitmap-editor patch-apps_diagram-viewer patch-examples_controlwidget_demo-tachometer_tcl patch-examples_plotchart_testtable_tcl patch-modules_plotchart_xyplot_tcl patch-support_installation_actions_tcl patch-support_installation_modules_tcl Removed files: devel/tklib/files: mkindex.tcl devel/tklib/patches: patch-examples_canvas_city_tcl patch-examples_tkpiechart_demo_tcl patch-installed_modules_tcl patch-modules_plotchart_plotcontour_tcl patch-modules_plotchart_plothist_test Log message: Update to 0.6. Installation changes like with tcllib. Mentry and wcb are now in tklib. Too many patches for stupidities. Thanks to Steve Havelka for distfile hosting. ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/14 02:44:34 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Mentry and wcb are now part of tklib.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/14 02:45:20 Modified files: devel : Makefile Log message: Mentry and wcb are now part of tklib.
Re: UPDATE: tcllib
On 11/10/13 02:42, Stuart Cassoff wrote: Update to 1.15. I have obtained distfile hosting! So, ok for this and tklib? Stu
Re: UPDATE: openocd
On 11/10/13 01:35, Stuart Cassoff wrote:
Update to use the newer jimtcl and libftdi.
I've got distfile hosting and ok for jimtcl.
Openocd will require updating once jimtcl goes in, innit?
Stu
Index: Makefile
===
RCS file: /cvs/ports/devel/openocd/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile21 Mar 2013 08:45:16 - 1.9
+++ Makefile14 Nov 2013 06:20:36 -
@@ -3,6 +3,7 @@
COMMENT = Open On-Chip Debugging
DISTNAME = openocd-0.6.1
+REVISION = 0
CATEGORIES = devel
SHARED_LIBS += openocd1.0 # unknown
@@ -35,11 +36,11 @@ CONFIGURE_ARGS = --disable-werror \
--enable-buspirate \
--disable-internal-jimtcl
-CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include \
+CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include
-I${LOCALBASE}/include/jim \
LDFLAGS=-L${LOCALBASE}/lib -pthread
LIB_DEPENDS = devel/libftdi \
- lang/jimtcl
+ lang/jimtcl=0.75
USE_GMAKE =Yes
NO_TEST = Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/12 11:53:03 Modified files: devel/libftdi : Makefile distinfo devel/libftdi/patches: patch-src_ftdi_c devel/libftdi/pkg: PLIST Removed files: devel/libftdi/pkg: PFRAG.shared Log message: Update to 0.20. ok landry@; thanks sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2013/11/12 13:12:02 Modified files: graphics/scratch: Makefile Log message: Tidy Makefile.
Re: UPDATE: libftdi
On 11/12/13 03:42, Stuart Henderson wrote: On 2013/11/11 23:02, Stuart Cassoff wrote: On 11/10/13 01:14, Stuart Cassoff wrote: Update to 0.20. Updated diff. Index: Makefile === RCS file: /cvs/ports/devel/libftdi/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile 21 Mar 2013 08:45:15 - 1.8 +++ Makefile 12 Nov 2013 04:00:48 - @@ -4,10 +4,9 @@ COMMENT = libftdi, interface to ftdi deb CATEGORIES =devel -DISTNAME = libftdi-0.18 -REVISION = 1 +DISTNAME = libftdi-0.20 -SHARED_LIBS = ftdi15.1# 19.0 +SHARED_LIBS = ftdi15.2# 21.0 Looking at a diff between old+new source, I don't see any changes that seem to warrant bumping the shared library minor. Ok. I thought there were some new functions added but I was mistaken. No lib bump, then. Stu
Re: UPDATE: tklib
On 11/10/13 02:46, Stuart Cassoff wrote:
Update to 0.6.
Better quirks.
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 Makefile
--- Makefile25 Sep 2013 07:57:37 - 1.95
+++ Makefile12 Nov 2013 03:44:24 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-1.92
+PKGNAME = quirks-1.93
PKG_ARCH = *
MAINTAINER = Marc Espie es...@openbsd.org
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.99
diff -u -p -u -p -r1.99 Quirks.pm
--- files/Quirks.pm 25 Sep 2013 07:57:38 - 1.99
+++ files/Quirks.pm 12 Nov 2013 03:44:24 -
@@ -322,11 +322,12 @@ my $stem_extensions = {
'php-mhash' = 'php',
'php-ncurses' = 'php',
'php-sqlite' = 'php',
- 'thttpd' = 'sthttpd',
'pecl-fileinfo' = 'php',
'thttpd' = 'sthttpd',
'dbus-python' = 'py-dbus',
'libungif' = 'giflib',
+ 'mentry' = 'tklib',
+ 'wcb' = 'tklib',
};
# -is_base_system($handle, $state):
Re: UPDATE: libftdi
On 11/10/13 01:14, Stuart Cassoff wrote:
Update to 0.20.
Updated diff.
Index: Makefile
===
RCS file: /cvs/ports/devel/libftdi/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile21 Mar 2013 08:45:15 - 1.8
+++ Makefile12 Nov 2013 04:00:48 -
@@ -4,10 +4,9 @@ COMMENT = libftdi, interface to ftdi deb
CATEGORIES = devel
-DISTNAME = libftdi-0.18
-REVISION = 1
+DISTNAME = libftdi-0.20
-SHARED_LIBS = ftdi15.1# 19.0
+SHARED_LIBS = ftdi15.2# 21.0
HOMEPAGE = http://www.intra2net.com/en/developer/libftdi/
Index: distinfo
===
RCS file: /cvs/ports/devel/libftdi/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo25 Oct 2010 20:55:53 - 1.2
+++ distinfo12 Nov 2013 04:00:48 -
@@ -1,5 +1,2 @@
-MD5 (libftdi-0.18.tar.gz) = kW9l+mjRVGIfwM8fQF8nJg==
-RMD160 (libftdi-0.18.tar.gz) = DoqaITWoK7RDVnjpGpUr8HV85y0=
-SHA1 (libftdi-0.18.tar.gz) = UkAdsOfLkKXYP4LChZpPjUTlJXk=
-SHA256 (libftdi-0.18.tar.gz) = W288PuUcaqJNO4cTXgF2LPaIIdHDWZ2H00n+pO3nTGI=
-SIZE (libftdi-0.18.tar.gz) = 398380
+SHA256 (libftdi-0.20.tar.gz) = MXbVtZhkOPM/UgjmkKi/6QlBvlAcwKchGM49M41Lg44=
+SIZE (libftdi-0.20.tar.gz) = 423570
Index: patches/patch-src_ftdi_c
===
RCS file: /cvs/ports/devel/libftdi/patches/patch-src_ftdi_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_ftdi_c
--- patches/patch-src_ftdi_c13 Nov 2011 13:54:04 - 1.1
+++ patches/patch-src_ftdi_c12 Nov 2013 04:00:48 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ftdi_c,v 1.1 2011/11/13 13:54:04 ajacoutot Exp $
src/ftdi.c.origSat Nov 12 23:30:50 2011
-+++ src/ftdi.c Sat Nov 12 23:31:17 2011
-@@ -45,6 +45,10 @@
+--- src/ftdi.c.origThu Mar 15 05:58:44 2012
src/ftdi.c Sat Nov 9 19:47:18 2013
+@@ -44,6 +44,10 @@
#include linux/usbdevice_fs.h
#endif
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared7 Jan 2009 21:35:59 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2009/01/07 21:35:59 matthieu Exp $
-@lib lib/libftdi.so.${LIBftdi_VERSION}
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libftdi/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 25 Oct 2010 20:55:53 - 1.3
+++ pkg/PLIST 12 Nov 2013 04:00:48 -
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2010/10/25 20:55:53 jasper Exp $
@conflict cppunit-1.12
-%%SHARED%%
@bin bin/baud_test
@bin bin/bitbang
@bin bin/bitbang2
@@ -8,10 +7,11 @@
@bin bin/bitbang_ft2232
@bin bin/find_all
bin/libftdi-config
-@bin bin/serial_read
+@bin bin/serial_test
@bin bin/simple
include/ftdi.h
lib/libftdi.a
lib/libftdi.la
+@lib lib/libftdi.so.${LIBftdi_VERSION}
lib/pkgconfig/
lib/pkgconfig/libftdi.pc
Re: UPDATE: jimtcl
On 11/10/13 01:30, Stuart Cassoff wrote:
Update to 0.75.
Updated diff.
Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:20:27 - 1.6
+++ Makefile12 Nov 2013 03:45:09 -
@@ -4,37 +4,42 @@ SHARED_ONLY= Yes
COMMENT= small footprint implementation of Tcl
-DISTNAME= jimtcl-0.73
-SHARED_LIBS= jim 1.0
+DISTNAME= jimtcl-0.75pl0
+SHARED_LIBS= jim 1.1
CATEGORIES=lang devel
HOMEPAGE= http://jim.tcl.tk/
+MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
# BSD
PERMIT_PACKAGE_CDROM= Yes
-# Upstream has no real releases, so it's a git tag
+# Git checkin fae001d74c06a6293798d6b27db874ff46610a42
MASTER_SITES= http://distfiles.nl/
-WANTLIB= c m
+WANTLIB= c m sqlite3
MODULES= lang/tcl
RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
-TEST_DEPENDS= devel/gmake
-MAKE_ENV+= SONAME_MAJOR=${LIBjim_VERSION:R} \
- SONAME_MINOR=${LIBjim_VERSION:E}
+MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_VERSION} \
+ SH_CFLAGS=${PICFLAG} \
+ SHOBJ_CFLAGS=${PICFLAG} \
+ SH_LDFLAGS=-shared
+
+FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
+ INSTALL_DATA='${INSTALL_DATA}' \
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+SEPARATE_BUILD = Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --full # ipv6, math, utf8, binary, oo, tree
-
-# Only test requires gmake, so cheat a bit here instead of forcing it
-# as a build dependency.
-do-test:
- cd ${WRKSRC} ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake test
+ --includedir=${PREFIX}/include/jim \
+ --full \
+ --with-mod=sqlite3 \
+ CCACHE=none
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Mar 2013 10:24:47 - 1.2
+++ distinfo12 Nov 2013 03:45:09 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.73.tar.gz) = aoS1yzn/ffjkfuwS91Zm4RwypNRP+DDGX+Lml/2IGt4=
-SIZE (jimtcl-0.73.tar.gz) = 2196689
+SHA256 (jimtcl-0.75pl0.tar.gz) = hke0AsUyrgKYC86LhjmwIIfw+psdyFyT0oiWECuGUjA=
+SIZE (jimtcl-0.75pl0.tar.gz) = 2217434
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 8 Mar 2013 10:24:47 - 1.3
+++ patches/patch-Makefile_in 12 Nov 2013 03:45:09 -
@@ -1,47 +1,63 @@
$OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $
-- Install docs into the right directory.
-- Add shared library versioning to libjim.
+Install everything nicely.
Makefile.in.orig Tue Feb 12 23:02:49 2013
-+++ Makefile.inTue Feb 12 23:04:36 2013
-@@ -33,6 +33,8 @@ VPATH := @srcdir@
- @if JIM_STATICLIB
- LIBJIM := libjim.a
- @else
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- LIBJIM := libjim.@LIBSOEXT@
- SH_LIBJIM := $(LIBJIM)
- CC += $(SH_CFLAGS)
-@@ -67,15 +69,14 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+--- Makefile.in.orig Sat Nov 9 00:49:42 2013
Makefile.inSat Nov 9 10:04:48 2013
+@@ -54,6 +54,12 @@ OBJS := _load-static-exts.o jim-subcmd.o jim-interacti
- @if JIM_INSTALL
- install: all docs @TCL_EXTS@ install-exec
-- mkdir -p $(DESTDIR)$(prefix)/lib/jim
-- cp $(LIBJIM) $(DESTDIR)$(prefix)/lib
-- cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@
$(DESTDIR)$(prefix)/lib/jim
-+ mkdir -p $(DESTDIR)$(prefix)/share/doc/jim
-+ cp $(LIBJIM).$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(prefix)/lib
-+ cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@
$(DESTDIR)$(prefix)/share/doc/jim/
- mkdir -p $(DESTDIR)$(prefix)/include
- cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
- @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h
$(DESTDIR)$(prefix)/include
- cp jim-config.h $(DESTDIR)$(prefix)/include
+ JIMSH := jimsh@EXEEXT@
+
++@if JIM_INSTALL
++INSTALL_DATA_DIR ?= mkdir -p
++INSTALL_DATA ?= cp
++INSTALL_PROGRAM ?= cp
++@endif
++
+ all: $(JIMSH) @C_EXT_SHOBJS@
+
+ # Create C extensions from pure Tcl extensions
+@@ -66,8 +72,8 @@ docs: Tcl.html
+
+ @if JIM_DOCS
+ install-docs: docs
- mkdir -p $(DESTDIR)$(prefix)/doc/jim
- cp Tcl.html $(DESTDIR)$(prefix)/doc/jim
UPDATE: tklib
Update to 0.6.
Installation changes like with tcllib.
Mentry and wcb are now in tklib.
Quirks and PLIST are ok?
Too many patches for stupidities; waiting on upstream.
Stu
Index: Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1175
diff -u -p -u -p -r1.1175 Makefile
--- Makefile9 Nov 2013 10:38:38 - 1.1175
+++ Makefile10 Nov 2013 07:24:11 -
@@ -439,7 +439,6 @@
SUBDIR += m4
SUBDIR += maven
SUBDIR += mcs
- SUBDIR += mentry
SUBDIR += mercurial
SUBDIR += metaauto
SUBDIR += mico
@@ -1399,7 +1398,6 @@
SUBDIR += vte
SUBDIR += vte3
SUBDIR += waf
- SUBDIR += wcb
SUBDIR += xdg-user-dirs
SUBDIR += xdg-utils
SUBDIR += xmake
Index: mentry/Makefile
===
RCS file: mentry/Makefile
diff -N mentry/Makefile
--- mentry/Makefile 9 Nov 2013 18:22:02 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,49 +0,0 @@
-# $OpenBSD: Makefile,v 1.5 2013/11/09 18:22:02 zhuk Exp $
-
-COMMENT = multi-entry widget package for Tcl/Tk
-
-N =mentry
-DISTNAME = $N3.6
-PKGNAME = $N-3.6
-CATEGORIES = devel
-HOMEPAGE = http://www.nemethi.de/
-MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
-
-# ISC style
-PERMIT_PACKAGE_CDROM = Yes
-
-MASTER_SITES = ${HOMEPAGE:=$N/}
-MODULES = lang/tcl
-RUN_DEPENDS = devel/wcb
-NO_BUILD = Yes
-NO_TEST = Yes
-PKG_ARCH = *
-REVISION = 0
-
-MT_LIB_DIR = ${PREFIX}/lib/tcl/$N
-MT_DOC_DIR = ${PREFIX}/share/doc/$N
-MT_EXA_DIR = ${PREFIX}/share/examples/$N
-MT_SCR_DIR = ${MT_LIB_DIR}/scripts
-
-EXA_SCRIPTS = datetime1.tcl datetime1_tile.tcl datetime2.tcl \
- datetime2_tile.tcl ethernetaddr.tcl ethernetaddr_tile.tcl \
- phonenumber.tcl phonenumber_tile.tcl
-
-do-configure:
- @${MODTCL_WISH_ADJ} ${EXA_SCRIPTS:S!^!${WRKSRC}/demos/!}
-
-do-install:
- ${INSTALL_DATA_DIR} ${MT_SCR_DIR} ${MT_DOC_DIR} ${MT_EXA_DIR}
-.for SRC GLOB DEST in \
- . *.tcl ${MT_LIB_DIR} \
- scripts * ${MT_SCR_DIR} \
- doc * ${MT_DOC_DIR} \
- . CHANGES.txt ${MT_DOC_DIR} \
- . COPYRIGHT.txt ${MT_DOC_DIR} \
- . README.txt ${MT_DOC_DIR} \
- demos *.tcl ${MT_EXA_DIR}
- ${INSTALL_DATA} ${WRKSRC}/${SRC}/${GLOB} ${DEST}
-.endfor
- chmod ${BINMODE} ${EXA_SCRIPTS:S!^!${MT_EXA_DIR}/!}
-
-.include bsd.port.mk
Index: mentry/distinfo
===
RCS file: mentry/distinfo
diff -N mentry/distinfo
--- mentry/distinfo 18 Apr 2012 09:42:19 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,5 +0,0 @@
-MD5 (mentry3.6.tar.gz) = fvrOhfl56K5y0tntUGOojg==
-RMD160 (mentry3.6.tar.gz) = NqDthktomAkz/ETs9RbMUnLEu3o=
-SHA1 (mentry3.6.tar.gz) = y+eEeKA7apKyUWluEKv4KHjavLw=
-SHA256 (mentry3.6.tar.gz) = knvyarzeSirGS1/8L/aV1loE7ymZkrIoR+ldeCVmaUU=
-SIZE (mentry3.6.tar.gz) = 88479
Index: mentry/pkg/DESCR
===
RCS file: mentry/pkg/DESCR
diff -N mentry/pkg/DESCR
--- mentry/pkg/DESCR17 Jan 2011 06:53:35 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,3 +0,0 @@
-Tcl/Tk script library providing multi-entry/label widgets for
-display and editing of real numbers in fixed point format,
-IPv4 and IPv6 addresses, dates, times, etc.
Index: mentry/pkg/PLIST
===
RCS file: mentry/pkg/PLIST
diff -N mentry/pkg/PLIST
--- mentry/pkg/PLIST17 Jan 2011 06:53:35 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,44 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/01/17 06:53:35 stu Exp $
-lib/tcl/mentry/
-lib/tcl/mentry/mentry.tcl
-lib/tcl/mentry/mentryPublic.tcl
-lib/tcl/mentry/mentry_tile.tcl
-lib/tcl/mentry/pkgIndex.tcl
-lib/tcl/mentry/scripts/
-lib/tcl/mentry/scripts/mentryDateTime.tcl
-lib/tcl/mentry/scripts/mentryFixedPoint.tcl
-lib/tcl/mentry/scripts/mentryIPAddr.tcl
-lib/tcl/mentry/scripts/mentryIPv6Addr.tcl
-lib/tcl/mentry/scripts/mentryThemes.tcl
-lib/tcl/mentry/scripts/mentryWidget.tcl
-lib/tcl/mentry/scripts/mwutil.tcl
-lib/tcl/mentry/scripts/tclIndex
-share/doc/mentry/
-share/doc/mentry/CHANGES.txt
-share/doc/mentry/COPYRIGHT.txt
-share/doc/mentry/README.txt
-share/doc/mentry/datetime1.png
-share/doc/mentry/datetime2.png
-share/doc/mentry/ethernetaddr.png
-share/doc/mentry/index.html
-share/doc/mentry/mentry.html
-share/doc/mentry/mentryDateTime.html
-share/doc/mentry/mentryFixedPoint.html
-share/doc/mentry/mentryIPAddr.html
-share/doc/mentry/mentryIPv6Addr.html
-share/doc/mentry/mentryThemes.html
-share/doc/mentry/mentryWidget.html
-share/doc/mentry/phonenumber.png
-share/doc/mentry
Re: UPDATE: tcllib
On 11/10/13 04:02, Landry Breuil wrote: On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: Update to 1.15. Some stuff went upstream. Instead of doing all that ridiculous work in the Makefile, I've moved it all to Tcllib's installer itself. This should make future updates a lot less painful. I'll fill in MASTER_SITES before commiting. Distfile on cvs:~stu So upstream makes releases, but dont provide tarballs ? Or it's a handrolled tarball from a git hash ? Landry They make releases but there have been substantial changes since the last release. I keep pushing stuff upstream. There'd be many more patches if we used the release. For Tklib it'd be even worse, something like 40+ patches. Hand-rolled tarball from fossil. In the Makefile I should s/snapshot/checkin/. What about naming? Would tcllib-1.15.checkinId.tar.gz be too much? Stu
Re: UPDATE: jimtcl
On 11/10/13 04:00, Landry Breuil wrote: On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote: Update to 0.75. Jimtcl picks up ccache if installed and won't build without USE_CCACHE=Yes, so I decided to force it. I'd rather see it patched to not pick it up. Even if ccache is available everywhere, i dont think it makes much sense here. Ok, I'll take it out. Remove the SONAME stuff, I don't see how it would be needed. There should no longer be a need to play with -fPIC. Patch removed. If needed, can be done in the port Makefile. Did check that on several archs to make sure it wasnt needed ? Looking at config code, commit messages on the site and bsd.own.mk it seems I'll have to make an adjustment for alpha. Spark looks ok. Stu
Re: UPDATE: jimtcl
On 11/10/13 04:24, Stuart Cassoff wrote:
On 11/10/13 04:00, Landry Breuil wrote:
On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote:
Update to 0.75.
Jimtcl picks up ccache if installed and won't build
without USE_CCACHE=Yes, so I decided to force it.
I'd rather see it patched to not pick it up. Even if ccache is available
everywhere, i dont think it makes much sense here.
Ok, I'll take it out.
Remove the SONAME stuff, I don't see how it would be needed.
There should no longer be a need to play with -fPIC.
Patch removed. If needed, can be done in the port Makefile.
Did check that on several archs to make sure it wasnt needed ?
Looking at config code, commit messages on the site and bsd.own.mk
it seems I'll have to make an adjustment for alpha.
Spark looks ok.
Updated diff with those changes.
Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:20:27 - 1.6
+++ Makefile10 Nov 2013 09:46:52 -
@@ -4,37 +4,42 @@ SHARED_ONLY= Yes
COMMENT= small footprint implementation of Tcl
-DISTNAME= jimtcl-0.73
-SHARED_LIBS= jim 1.0
+DISTNAME= jimtcl-0.75
+SHARED_LIBS= jim 1.1
CATEGORIES=lang devel
HOMEPAGE= http://jim.tcl.tk/
+MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
# BSD
PERMIT_PACKAGE_CDROM= Yes
-# Upstream has no real releases, so it's a git tag
+# Git snapshot fae001d74c06a6293798d6b27db874ff46610a42
MASTER_SITES= http://distfiles.nl/
-WANTLIB= c m
+WANTLIB= c m sqlite3
MODULES= lang/tcl
RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
-TEST_DEPENDS= devel/gmake
-MAKE_ENV+= SONAME_MAJOR=${LIBjim_VERSION:R} \
- SONAME_MINOR=${LIBjim_VERSION:E}
+MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_VERSION} \
+ SH_CFLAGS=${PICFLAG} \
+ SHOBJ_CFLAGS=${PICFLAG} \
+ SH_LDFLAGS=-shared
+
+FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
+ INSTALL_DATA='${INSTALL_DATA}' \
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+SEPARATE_BUILD = Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --full # ipv6, math, utf8, binary, oo, tree
-
-# Only test requires gmake, so cheat a bit here instead of forcing it
-# as a build dependency.
-do-test:
- cd ${WRKSRC} ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake test
+ --includedir=${PREFIX}/include/jim \
+ --full \
+ --with-mod=sqlite3 \
+ CCACHE=none
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Mar 2013 10:24:47 - 1.2
+++ distinfo10 Nov 2013 09:46:52 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.73.tar.gz) = aoS1yzn/ffjkfuwS91Zm4RwypNRP+DDGX+Lml/2IGt4=
-SIZE (jimtcl-0.73.tar.gz) = 2196689
+SHA256 (jimtcl-0.75.tar.gz) = mAKk+BxXNiqxWLAj2H7feD3XQfmtiK1HUWj+sPljldo=
+SIZE (jimtcl-0.75.tar.gz) = 2217469
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 8 Mar 2013 10:24:47 - 1.3
+++ patches/patch-Makefile_in 10 Nov 2013 09:46:52 -
@@ -1,47 +1,63 @@
$OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $
-- Install docs into the right directory.
-- Add shared library versioning to libjim.
+Install everything nicely.
Makefile.in.orig Tue Feb 12 23:02:49 2013
-+++ Makefile.inTue Feb 12 23:04:36 2013
-@@ -33,6 +33,8 @@ VPATH := @srcdir@
- @if JIM_STATICLIB
- LIBJIM := libjim.a
- @else
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- LIBJIM := libjim.@LIBSOEXT@
- SH_LIBJIM := $(LIBJIM)
- CC += $(SH_CFLAGS)
-@@ -67,15 +69,14 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+--- Makefile.in.orig Sat Nov 9 00:49:42 2013
Makefile.inSat Nov 9 10:04:48 2013
+@@ -54,6 +54,12 @@ OBJS := _load-static-exts.o jim-subcmd.o jim-interacti
- @if JIM_INSTALL
- install: all docs @TCL_EXTS@ install-exec
-- mkdir -p $(DESTDIR)$(prefix)/lib/jim
-- cp $(LIBJIM) $(DESTDIR)$(prefix)/lib
-- cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@
$(DESTDIR)$(prefix)/lib/jim
-+ mkdir -p $(DESTDIR)$(prefix)/share/doc/jim
-+ cp $(LIBJIM).$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR
Re: UPDATE: tcllib
On 11/10/13 04:39, Landry Breuil wrote: On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: On 11/10/13 04:02, Landry Breuil wrote: On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: Update to 1.15. Some stuff went upstream. Instead of doing all that ridiculous work in the Makefile, I've moved it all to Tcllib's installer itself. This should make future updates a lot less painful. I'll fill in MASTER_SITES before commiting. Distfile on cvs:~stu So upstream makes releases, but dont provide tarballs ? Or it's a handrolled tarball from a git hash ? Landry They make releases but there have been substantial changes since the last release. I keep pushing stuff upstream. There'd be many more patches if we used the release. For Tklib it'd be even worse, something like 40+ patches. Hand-rolled tarball from fossil. In the Makefile I should s/snapshot/checkin/. What about naming? Would tcllib-1.15.checkinId.tar.gz be too much? something like 1.15.2013 to make it clear it's _post_ 1.15. Landry Gr. Chekin id is wrong in the Makefile. Base version + shortened checkin id. Points to the exact spot that it came from. tcllib-1.15_fdbe5cb1bc.tar.gz Bikeshedder^W Stu
Re: UPDATE: tcllib
On 11/10/13 04:58, Landry Breuil wrote: On Sun, Nov 10, 2013 at 04:55:29AM -0500, Stuart Cassoff wrote: On 11/10/13 04:39, Landry Breuil wrote: On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: On 11/10/13 04:02, Landry Breuil wrote: On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: Update to 1.15. Some stuff went upstream. Instead of doing all that ridiculous work in the Makefile, I've moved it all to Tcllib's installer itself. This should make future updates a lot less painful. I'll fill in MASTER_SITES before commiting. Distfile on cvs:~stu So upstream makes releases, but dont provide tarballs ? Or it's a handrolled tarball from a git hash ? Landry They make releases but there have been substantial changes since the last release. I keep pushing stuff upstream. There'd be many more patches if we used the release. For Tklib it'd be even worse, something like 40+ patches. Hand-rolled tarball from fossil. In the Makefile I should s/snapshot/checkin/. What about naming? Would tcllib-1.15.checkinId.tar.gz be too much? something like 1.15.2013 to make it clear it's _post_ 1.15. Landry Gr. Chekin id is wrong in the Makefile. Base version + shortened checkin id. Points to the exact spot that it came from. tcllib-1.15_fdbe5cb1bc.tar.gz Problem with that is that it's not a real version, so you cant use it as a PKGNAME. Your call, use the checking hash for DISTNAME then handroll PKGNAME with a .201311xx, or just use a date for both so you dont have to futze PKGNAME. Ok so I'll go with tcllib-1.15.2013.tar.gz (assuming tomorrow ;) or whatever date, and mention the checkin id in the Makefile. Stu
Re: UPDATE: tcllib
On 11/10/13 05:27, Vadim Zhukov wrote: There is also a nice plN feature (from the patch level), which pkg_add knows about, too. I didn't see anything in the man page. Please explain. Stu
Re: UPDATE: tcllib
On 11/10/13 11:38, Vadim Zhukov wrote: 2013/11/10 Stuart Cassoff s...@bell.net: On 11/10/13 05:27, Vadim Zhukov wrote: There is also a nice plN feature (from the patch level), which pkg_add knows about, too. I didn't see anything in the man page. Please explain. See The last part... paragraph in packages-specs(7). :) It's a known suffix, which is used by almost noone these days but is recognized by pkg_add(1). Thus you can set version to foo-1.0pl0, effectively both preserving upstream's versioning scheme and having it higher than foo-1.0. Great, thanks. That's what I'll do then: tcllib-1.15pl0 et al. Nice and concise. Stu
Re: UPDATE: jimtcl
On 11/10/13 14:39, Stuart Henderson wrote: On 2013/11/10 10:00, Landry Breuil wrote: On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote: Update to 0.75. Jimtcl picks up ccache if installed and won't build without USE_CCACHE=Yes, so I decided to force it. I'd rather see it patched to not pick it up. Even if ccache is available everywhere, i dont think it makes much sense here. USE_CCACHE is described as 'user settings' in bsd.port.mk(5), these are just for the user to set (e.g. in mk.conf or on the command line) and mustn't be set in a port. Thanks. I understand better now. It's been removed. Stu
Re: UPDATE: libftdi
On 11/10/13 14:44, Stuart Henderson wrote: On 2013/11/10 01:14, Stuart Cassoff wrote: I don't understand the SHARED_LIBS comment but changed it anyway. :/ The comment has the original version from upstream - see shared_libs.log in the build dir. Thanks. Fixed. One less thing I don't understand. Stu
UPDATE: libftdi
Update to 0.20.
I built all dependent ports against it on i386, looks ok.
I don't understand the SHARED_LIBS comment but changed it anyway. :/
Stu
Index: Makefile
===
RCS file: /cvs/ports/devel/libftdi/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile21 Mar 2013 08:45:15 - 1.8
+++ Makefile10 Nov 2013 04:33:12 -
@@ -4,10 +4,9 @@ COMMENT = libftdi, interface to ftdi deb
CATEGORIES = devel
-DISTNAME = libftdi-0.18
-REVISION = 1
+DISTNAME = libftdi-0.20
-SHARED_LIBS = ftdi15.1# 19.0
+SHARED_LIBS = ftdi15.2# 20.0
HOMEPAGE = http://www.intra2net.com/en/developer/libftdi/
Index: distinfo
===
RCS file: /cvs/ports/devel/libftdi/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo25 Oct 2010 20:55:53 - 1.2
+++ distinfo10 Nov 2013 04:33:12 -
@@ -1,5 +1,2 @@
-MD5 (libftdi-0.18.tar.gz) = kW9l+mjRVGIfwM8fQF8nJg==
-RMD160 (libftdi-0.18.tar.gz) = DoqaITWoK7RDVnjpGpUr8HV85y0=
-SHA1 (libftdi-0.18.tar.gz) = UkAdsOfLkKXYP4LChZpPjUTlJXk=
-SHA256 (libftdi-0.18.tar.gz) = W288PuUcaqJNO4cTXgF2LPaIIdHDWZ2H00n+pO3nTGI=
-SIZE (libftdi-0.18.tar.gz) = 398380
+SHA256 (libftdi-0.20.tar.gz) = MXbVtZhkOPM/UgjmkKi/6QlBvlAcwKchGM49M41Lg44=
+SIZE (libftdi-0.20.tar.gz) = 423570
Index: patches/patch-src_ftdi_c
===
RCS file: /cvs/ports/devel/libftdi/patches/patch-src_ftdi_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_ftdi_c
--- patches/patch-src_ftdi_c13 Nov 2011 13:54:04 - 1.1
+++ patches/patch-src_ftdi_c10 Nov 2013 04:33:12 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ftdi_c,v 1.1 2011/11/13 13:54:04 ajacoutot Exp $
src/ftdi.c.origSat Nov 12 23:30:50 2011
-+++ src/ftdi.c Sat Nov 12 23:31:17 2011
-@@ -45,6 +45,10 @@
+--- src/ftdi.c.origThu Mar 15 05:58:44 2012
src/ftdi.c Sat Nov 9 19:47:18 2013
+@@ -44,6 +44,10 @@
#include linux/usbdevice_fs.h
#endif
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared7 Jan 2009 21:35:59 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2009/01/07 21:35:59 matthieu Exp $
-@lib lib/libftdi.so.${LIBftdi_VERSION}
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libftdi/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 25 Oct 2010 20:55:53 - 1.3
+++ pkg/PLIST 10 Nov 2013 04:33:12 -
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2010/10/25 20:55:53 jasper Exp $
@conflict cppunit-1.12
-%%SHARED%%
@bin bin/baud_test
@bin bin/bitbang
@bin bin/bitbang2
@@ -8,10 +7,11 @@
@bin bin/bitbang_ft2232
@bin bin/find_all
bin/libftdi-config
-@bin bin/serial_read
+@bin bin/serial_test
@bin bin/simple
include/ftdi.h
lib/libftdi.a
lib/libftdi.la
+@lib lib/libftdi.so.${LIBftdi_VERSION}
lib/pkgconfig/
lib/pkgconfig/libftdi.pc
UPDATE: jimtcl
Update to 0.75.
Jimtcl picks up ccache if installed and won't build
without USE_CCACHE=Yes, so I decided to force it.
Remove the SONAME stuff, I don't see how it would be needed.
There should no longer be a need to play with -fPIC.
Patch removed. If needed, can be done in the port Makefile.
Gmake not needed.
Put include files in their own dir.
Install examples.
Install loadable sqlite3 extension.
Take maintainership, with permission.
Distfile at cvs:~stu
Stu
Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:20:27 - 1.6
+++ Makefile10 Nov 2013 06:00:14 -
@@ -4,37 +4,41 @@ SHARED_ONLY= Yes
COMMENT= small footprint implementation of Tcl
-DISTNAME= jimtcl-0.73
-SHARED_LIBS= jim 1.0
+DISTNAME= jimtcl-0.75
+SHARED_LIBS= jim 1.1
CATEGORIES=lang devel
HOMEPAGE= http://jim.tcl.tk/
+MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
# BSD
PERMIT_PACKAGE_CDROM= Yes
-# Upstream has no real releases, so it's a git tag
+# Git snapshot fae001d74c06a6293798d6b27db874ff46610a42
MASTER_SITES= http://distfiles.nl/
-WANTLIB= c m
+WANTLIB= c m sqlite3
MODULES= lang/tcl
RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
-TEST_DEPENDS= devel/gmake
-MAKE_ENV+= SONAME_MAJOR=${LIBjim_VERSION:R} \
- SONAME_MINOR=${LIBjim_VERSION:E}
+MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_VERSION} \
+ SH_LDFLAGS=-shared
+FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
+ INSTALL_DATA='${INSTALL_DATA}' \
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+
+SEPARATE_BUILD = Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --full # ipv6, math, utf8, binary, oo, tree
+ --includedir=${PREFIX}/include/jim \
+ --full --with-mod=sqlite3
-# Only test requires gmake, so cheat a bit here instead of forcing it
-# as a build dependency.
-do-test:
- cd ${WRKSRC} ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake test
+# Jimtcl will pick up ccache if installed, so force it
+USE_CCACHE = Yes
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Mar 2013 10:24:47 - 1.2
+++ distinfo10 Nov 2013 06:00:14 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.73.tar.gz) = aoS1yzn/ffjkfuwS91Zm4RwypNRP+DDGX+Lml/2IGt4=
-SIZE (jimtcl-0.73.tar.gz) = 2196689
+SHA256 (jimtcl-0.75.tar.gz) = mAKk+BxXNiqxWLAj2H7feD3XQfmtiK1HUWj+sPljldo=
+SIZE (jimtcl-0.75.tar.gz) = 2217469
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 8 Mar 2013 10:24:47 - 1.3
+++ patches/patch-Makefile_in 10 Nov 2013 06:00:14 -
@@ -1,47 +1,63 @@
$OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $
-- Install docs into the right directory.
-- Add shared library versioning to libjim.
+Install everything nicely.
Makefile.in.orig Tue Feb 12 23:02:49 2013
-+++ Makefile.inTue Feb 12 23:04:36 2013
-@@ -33,6 +33,8 @@ VPATH := @srcdir@
- @if JIM_STATICLIB
- LIBJIM := libjim.a
- @else
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- LIBJIM := libjim.@LIBSOEXT@
- SH_LIBJIM := $(LIBJIM)
- CC += $(SH_CFLAGS)
-@@ -67,15 +69,14 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+--- Makefile.in.orig Sat Nov 9 00:49:42 2013
Makefile.inSat Nov 9 10:04:48 2013
+@@ -54,6 +54,12 @@ OBJS := _load-static-exts.o jim-subcmd.o jim-interacti
- @if JIM_INSTALL
- install: all docs @TCL_EXTS@ install-exec
-- mkdir -p $(DESTDIR)$(prefix)/lib/jim
-- cp $(LIBJIM) $(DESTDIR)$(prefix)/lib
-- cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@
$(DESTDIR)$(prefix)/lib/jim
-+ mkdir -p $(DESTDIR)$(prefix)/share/doc/jim
-+ cp $(LIBJIM).$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(prefix)/lib
-+ cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@
$(DESTDIR)$(prefix)/share/doc/jim/
- mkdir -p $(DESTDIR)$(prefix)/include
- cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
- @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h
$(DESTDIR)$(prefix)/include
- cp jim-config.h $(DESTDIR)$(prefix)/include
+ JIMSH := jimsh@EXEEXT@
+
++@if JIM_INSTALL
++INSTALL_DATA_DIR ?= mkdir -p
UPDATE: openocd
Update to use the newer jimtcl and libftdi.
Currently:
$ cd /usr/ports/devel/openocd/ make configure /dev/null
configure: WARNING: You need a newer libftdi version (0.20 or later).
Stu
Index: Makefile
===
RCS file: /cvs/ports/devel/openocd/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile21 Mar 2013 08:45:16 - 1.9
+++ Makefile10 Nov 2013 05:45:37 -
@@ -3,6 +3,7 @@
COMMENT = Open On-Chip Debugging
DISTNAME = openocd-0.6.1
+REVISION = 0
CATEGORIES = devel
SHARED_LIBS += openocd1.0 # unknown
@@ -35,11 +36,11 @@ CONFIGURE_ARGS = --disable-werror \
--enable-buspirate \
--disable-internal-jimtcl
-CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include \
+CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include
-I${LOCALBASE}/include/jim \
LDFLAGS=-L${LOCALBASE}/lib -pthread
-LIB_DEPENDS = devel/libftdi \
- lang/jimtcl
+LIB_DEPENDS = devel/libftdi=0.20 \
+ lang/jimtcl=0.75
USE_GMAKE =Yes
NO_TEST = Yes
UPDATE: tcllib
Update to 1.15.
Some stuff went upstream.
Instead of doing all that ridiculous work in the Makefile,
I've moved it all to Tcllib's installer itself.
This should make future updates a lot less painful.
I'll fill in MASTER_SITES before commiting.
Distfile on cvs:~stu
Stu
Index: Makefile
===
RCS file: /cvs/ports/devel/tcllib/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile9 Nov 2013 18:22:02 - 1.18
+++ Makefile10 Nov 2013 07:18:48 -
@@ -2,7 +2,7 @@
COMMENT = Tcl Standard Library
-DISTNAME = tcllib-1.14
+DISTNAME = tcllib-1.15
CATEGORIES = devel lang/tcl
HOMEPAGE = http://sourceforge.net/projects/tcllib/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -10,51 +10,14 @@ MAINTAINER =Stuart Cassoff stwo@users.
# BSD style
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcllib/}
+# Fossil snapshot 504cc3a9f31bdf671388f1e995ef621595ca66b7
+MASTER_SITES = somewhere
MODULES = lang/tcl
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
USE_GROFF =Yes
NO_BUILD = Yes
PKG_ARCH = *
-REVISION = 0
-
-SCRIPTS_TCLSH_APPS = \
- dtplite page nns nnsd nnslog tcldocstrip
-
-SCRIPTS_TCLSH = \
- bibtex/bibtex.tcl \
- csv/csv2html csv/csvcut csv/csvdiff csv/csvjoin csv/csvsort csv/csvuniq
\
- ftp/ftpdemo.tcl ftp/ftpvalid \
- htmlparse/webviewer.tcl \
- irc/irc_example.tcl \
- ldap/ldapChangeTest ldap/ldapquery ldap/ldifdump \
- logger/logtotext.tcl \
- mapproj/tkmap.tcl \
- math/bigfloat.demo.tcl \
- ntp/rdate.tcl \
- sasl/saslclient.tcl \
- smtpd/tcl_smtpd smtpd/tk_smtpd \
- struct/diff.tcl struct/diff2.tcl \
- tepam/tepam_demo.tcl \
- term/attributes term/box term/box2 term/clear term/colors term/frame \
- term/graphics term/imenu term/ipager term/menu term/menu2 term/para \
- term/title \
- tie/receiving_client.tcl tie/sending_client.tcl tie/server.tcl \
- tie/transceiver.tcl
-
-SCRIPTS_TCLSH_NOEXEC = \
- ftp/hpupdate.tcl ftp/mirror.tcl ftp/newer.tcl \
- ftpd/ftpd ftpd/ftpd.test ftpd/ftpd.unix \
- logger/logtofile.tcl \
- mime/maildemo.tcl mime/mbot/impersonal.tcl mime/mbot/personal.tcl \
- nntp/postnews
-
-do-configure:
- @${MODTCL_TCLSH_ADJ} \
- ${SCRIPTS_TCLSH_APPS:S!^!${WRKSRC}/apps/!} \
- ${SCRIPTS_TCLSH:S!^!${WRKSRC}/examples/!} \
- ${SCRIPTS_TCLSH_NOEXEC:S!^!${WRKSRC}/examples/!}
do-install:
${MODTCL_BIN} ${WRKSRC}/installer.tcl \
@@ -63,19 +26,15 @@ do-install:
-pkg-path ${DESTDIR}${MODTCL_TCLDIR} \
-nroff-path ${PREFIX}/man/mann \
-example-path ${PREFIX}/share/examples/tcllib \
- -app-path ${PREFIX}/share/examples/tcllib/apps
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
+ -app-path ${PREFIX}/share/examples/tcllib/apps \
+ -csb ${PREFIX}/share/doc \
+ -tclsh ${MODTCL_BIN} \
+ -descr `cat ${PKGDIR}/DESCR`
mv ${PREFIX}/share/examples/tcllib/apps/dtplite ${PREFIX}/bin
- @chmod ${BINMODE}
${SCRIPTS_TCLSH:S!logger!log!:S!^!${PREFIX}/share/examples/tcllib/!}
- ${SETENV} TCLLIBPATH=${DESTDIR}${MODTCL_TCLDIR} ${MODTCL_BIN} \
- ${FILESDIR}/mkindex.tcl ${PREFIX}/man/mann \
- ${PKGDIR}/DESCR ${PREFIX}/man/mann/tcllib.n tcllib ${COMMENT}
1.14
- @chown ${MANOWN}:${MANGRP} ${PREFIX}/man/mann/tcllib.n
- @chmod ${MANMODE} ${PREFIX}/man/mann/tcllib.n
# Define TEST_MODULES to restrict to a subset of regression tests.
do-test:
- ${SETENV} ${MAKE_ENV} ${MODTCL_BIN} \
- ${WRKSRC}/sak.tcl test run -v ${TEST_MODULES}
+ ${SETENV} ${MAKE_ENV} ${TEST_FLAGS} \
+ ${MODTCL_BIN} ${WRKSRC}/sak.tcl test run -v ${TEST_MODULES}
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/tcllib/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo9 Mar 2012 14:15:32 - 1.10
+++ distinfo10 Nov 2013 07:18:48 -
@@ -1,5 +1,2 @@
-MD5 (tcllib-1.14.tar.gz) = VbrJr85UwzKPNokYzC16Sw==
-RMD160 (tcllib-1.14.tar.gz) = 5XWnQzXCV0dKAJkjmG0nP+HItFo=
-SHA1 (tcllib-1.14.tar.gz) = jDYSCZ6vEcdn85CKl/zSmdQu4h8=
-SHA256 (tcllib-1.14.tar.gz) = 3RSfyzfOsE2oNTEnap11Y4J4B9zuSfm59jvt6p4TBYQ=
-SIZE (tcllib-1.14.tar.gz) = 5384078
+SHA256 (tcllib-1.15.tar.gz) = JJNOb9/02KoGYNDEaFTxMsfw7wlRI9miiylIYLddwxM=
+SIZE (tcllib-1.15.tar.gz) = 7623045
Index: files/mkindex.tcl
===
RCS file: files/mkindex.tcl
diff -N files/mkindex.tcl
--- files/mkindex.tcl 9 Mar 2012 14:15:32 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-# $OpenBSD: mkindex.tcl,v 1.2 2012/03/09 14:15:32 stu Exp
