Re: MAINTAINER UPDATE: net/tcludp to 1.0.11

2014-10-09 Thread Stuart Cassoff 
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: MAINTAINER UPDATE: net/tcludp to 1.0.11

2014-10-09 Thread Stuart Cassoff 
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

MAINTAINER UPDATE: net/tcludp to 1.0.11

2014-10-08 Thread Sebastian Reitenbach 
Hi,

an easy update, tested with the only consumer net/coccinella on amd64.

OK?

? tcludp.diff
? patches/save.patch-configure
Index: Makefile
===
RCS file: /cvs/ports/net/tcludp/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile11 Mar 2013 11:35:57 -  1.8
+++ Makefile7 Oct 2014 17:34:49 -
@@ -4,9 +4,8 @@
 
 COMMENT =  Tcl UDP extension
 
-DISTNAME = tcludp-1.0.8
-REVISION = 0
-SHARED_LIBS =  udp108 0.0
+DISTNAME = tcludp-1.0.11
+SHARED_LIBS =  udp1011 0.0
 CATEGORIES =   net
 HOMEPAGE = http://tcludp.sourceforge.net/
 MAINTAINER =   Sebastian Reitenbach sebas...@openbsd.org
@@ -22,12 +21,13 @@
 SEPARATE_BUILD =Yes
 USE_GROFF =Yes
 CONFIGURE_STYLE=gnu
+WRKDIST =  ${WRKDIR}/tcludp
 
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR} \
--datadir=${PREFIX}/share/examples \
-   SHLIB_VERSION=${LIBudp108_VERSION} \
+   SHLIB_VERSION=${LIBudp1011_VERSION} \
CFLAGS=${CFLAGS} -pthread
 
 TEST_TARGET =test
Index: distinfo
===
RCS file: /cvs/ports/net/tcludp/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo28 Jul 2010 17:07:25 -  1.1.1.1
+++ distinfo7 Oct 2014 17:34:49 -
@@ -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: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 5 Jan 2011 18:08:46 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$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
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/tcludp/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   5 Jan 2011 18:08:46 -   1.2
+++ pkg/PLIST   7 Oct 2014 17:34:49 -
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2011/01/05 18:08:46 sebastia Exp $
 lib/tcl/tcludp/
-@lib lib/tcl/tcludp/libudp108.so.${LIBudp108_VERSION}
+@lib lib/tcl/tcludp/libudp1011.so.${LIBudp1011_VERSION}
 lib/tcl/tcludp/pkgIndex.tcl
 @man man/mann/udp.n
 share/examples/tcludp/