Below comes message from Stuart Cassoff. For some reason it didn't make it to ports@, so I am forwarding it upon his request.
----- Forwarded message from Stuart Cassoff <[email protected]> ----- Date: Wed, 8 Jul 2015 15:15:07 -0400 From: Stuart Cassoff <[email protected]> To: "Dmitrij D. Czarkoff" <[email protected]>, [email protected] Subject: Re: New: security/tclgpg User-Agent: Mozilla/5.0 (X11; OpenBSD i386; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 On 06/28/15 07:01, Dmitrij D. Czarkoff wrote: > Hi! > > Tclgpg is a Tcl interface to GNU Privacy Guard. This library was > designed to replace TclGPGME, allowing the same functionality with any > GPG version. > > It is an optional dependency for net/tkabber, providing message signing > and encryption facilities. A diff for tkabber follows. (As I only > edited README, I didn't bump REVISION.) > Hi, here are some diff bits with notes, followed by a full diff. A few things are in TIMTOWDI territory and it may be a bit overdone. Upstream would do well by updating to a newer TEA. Tests, loads ok on i386 for me. Stu diff -uNr tclgpgo/Makefile tclgpg/Makefile --- tclgpgo/Makefile Sun Jun 28 06:42:45 2015 +++ tclgpg/Makefile Wed Jul 8 14:02:04 2015 Not needed; only linking to stub lib. -LIB_DEPENDS = ${MODTCL_LIB_DEPENDS} Did some stuff to make this work with bsd make. -USE_GMAKE = Yes Use 'no-autoheader' to prevent running automake unnecessarily. -CONFIGURE_STYLE = autoconf +CONFIGURE_STYLE = autoconf no-autoheader Fixup lib install perms. +FAKE_FLAGS = INSTALL_PROGRAM='$${INSTALL_DATA}' \ I'm starting to prefer to use this incantation to set the install dir. Install dir is package name without version. + pkglibdir='$$(libdir)/tcl/$$(PKG_DIR)' \ + PKG_DIR='$$(PACKAGE_NAME)' + Did some stuff to allow this to work. +SEPARATE_BUILD = Yes Don't use --libdir to set install dir; use FAKE_FLAGS. CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --libdir=${MODTCL_TCLDIR} Not needed. -CONFIGURE_ENV = LIBgpg10_VERSION=${LIBgpg10_VERSION} diff -uNr tclgpgo/patches/patch-Makefile_in tclgpg/patches/patch-Makefile_in --- tclgpgo/patches/patch-Makefile_in Wed Dec 31 19:00:00 1969 +++ tclgpg/patches/patch-Makefile_in Wed Jul 8 13:46:55 2015 Avoid gmake. +-ifeq (@BUILD_C_HELPER@, yes) +- BINARIES = $(lib_BINARIES) +-else +- BINARIES = +-endif + ++BINARIES = @BINARIES@ SEPARATE_BUILD. Don't build html docs if not installing them. +-doc: doc/gpg.n doc/gpg.html ++doc: $(srcdir)/doc/gpg.n SEPARATE_BUILD. Avoid gmake. The $> $^' combo should work in both bsd make and gmake. Maybe an idea for upstream. +-doc/gpg.n: doc/gpg.man +- dtplite -o $@ nroff $< ++$(srcdir)/doc/gpg.n: doc/gpg.man ++ dtplite -o $@ nroff $> $^ diff -uNr tclgpgo/patches/patch-configure_in tclgpg/patches/patch-configure_in --- tclgpgo/patches/patch-configure_in Wed Dec 31 19:00:00 1969 +++ tclgpg/patches/patch-configure_in Wed Jul 8 13:33:53 2015 Avoid gmake. ++AS_IF([test "$BUILD_C_HELPER" = yes], [BINARIES='$(lib_BINARIES)'], [BINARIES='']) ++AC_SUBST(BINARIES) diff -uNr tclgpgo/pkg/DESCR tclgpg/pkg/DESCR --- tclgpgo/pkg/DESCR Sun Jun 28 06:59:28 2015 +++ tclgpg/pkg/DESCR Wed Jul 8 14:48:19 2015 Small change and $ fmt -w 72. -Tclgpg is a Tcl interface to GNU Privacy Guard. This library was designed to +A Tcl interface to GNU Privacy Guard. This library was designed to replace TclGPGME, allowing the same functionality with any GPG version. diff -uNr tclgpgo/Makefile tclgpg/Makefile --- tclgpgo/Makefile Sun Jun 28 06:42:45 2015 +++ tclgpg/Makefile Wed Jul 8 14:02:04 2015 @@ -21,16 +21,19 @@ MODULES = lang/tcl BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} -LIB_DEPENDS = ${MODTCL_LIB_DEPENDS} RUN_DEPENDS = ${MODTCL_RUN_DEPENDS} \ security/gnupg -USE_GMAKE = Yes -CONFIGURE_STYLE = autoconf +FAKE_FLAGS = INSTALL_PROGRAM='$${INSTALL_DATA}' \ + pkglibdir='$$(libdir)/tcl/$$(PKG_DIR)' \ + PKG_DIR='$$(PACKAGE_NAME)' + +SEPARATE_BUILD = Yes +CONFIGURE_STYLE = autoconf no-autoheader + CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ - --libdir=${MODTCL_TCLDIR} -CONFIGURE_ENV = LIBgpg10_VERSION=${LIBgpg10_VERSION} + --with-tcl=${MODTCL_LIBDIR} + AUTOCONF_VERSION = 2.59 TEST_TARGET = test diff -uNr tclgpgo/patches/patch-Makefile_in tclgpg/patches/patch-Makefile_in --- tclgpgo/patches/patch-Makefile_in Wed Dec 31 19:00:00 1969 +++ tclgpg/patches/patch-Makefile_in Wed Jul 8 13:46:55 2015 @@ -0,0 +1,32 @@ +$OpenBSD$ +--- Makefile.in.orig Tue Mar 24 16:04:10 2015 ++++ Makefile.in Wed Jul 8 13:46:53 2015 +@@ -61,12 +61,9 @@ PKG_LIB_FILE = @PKG_LIB_FILE@ + PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ + + lib_BINARIES = $(PKG_LIB_FILE) +-ifeq (@BUILD_C_HELPER@, yes) +- BINARIES = $(lib_BINARIES) +-else +- BINARIES = +-endif + ++BINARIES = @BINARIES@ ++ + SHELL = @SHELL@ + + srcdir = @srcdir@ +@@ -191,10 +188,10 @@ libraries: + # end user machine when building from source. + #======================================================================== + +-doc: doc/gpg.n doc/gpg.html ++doc: $(srcdir)/doc/gpg.n + +-doc/gpg.n: doc/gpg.man +- dtplite -o $@ nroff $< ++$(srcdir)/doc/gpg.n: doc/gpg.man ++ dtplite -o $@ nroff $> $^ + + doc/gpg.html: doc/gpg.man + dtplite -o $@ html $< diff -uNr tclgpgo/patches/patch-configure_in tclgpg/patches/patch-configure_in --- tclgpgo/patches/patch-configure_in Wed Dec 31 19:00:00 1969 +++ tclgpg/patches/patch-configure_in Wed Jul 8 13:33:53 2015 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- configure.in.orig Wed Jul 8 13:33:35 2015 ++++ configure.in Wed Jul 8 13:33:07 2015 +@@ -41,6 +41,9 @@ echo "${BUILD_C_HELPER}" + + AC_SUBST(BUILD_C_HELPER) + ++AS_IF([test "$BUILD_C_HELPER" = yes], [BINARIES='$(lib_BINARIES)'], [BINARIES='']) ++AC_SUBST(BINARIES) ++ + #-------------------------------------------------------------------- + # Load the tclConfig.sh file + #-------------------------------------------------------------------- diff -uNr tclgpgo/pkg/DESCR tclgpg/pkg/DESCR --- tclgpgo/pkg/DESCR Sun Jun 28 06:59:28 2015 +++ tclgpg/pkg/DESCR Wed Jul 8 14:48:19 2015 @@ -1,2 +1,2 @@ -Tclgpg is a Tcl interface to GNU Privacy Guard. This library was designed to +A Tcl interface to GNU Privacy Guard. This library was designed to replace TclGPGME, allowing the same functionality with any GPG version. diff -uNr tclgpgo/pkg/PLIST tclgpg/pkg/PLIST --- tclgpgo/pkg/PLIST Sun Jun 28 06:33:01 2015 +++ tclgpg/pkg/PLIST Wed Jul 8 13:38:44 2015 @@ -1,6 +1,6 @@ @comment $OpenBSD$ -lib/tcl/gpg1.0/ -lib/tcl/gpg1.0/libgpg10.so -lib/tcl/gpg1.0/pkgIndex.tcl -lib/tcl/gpg1.0/tclgpg.tcl +lib/tcl/gpg/ +lib/tcl/gpg/libgpg10.so +lib/tcl/gpg/pkgIndex.tcl +lib/tcl/gpg/tclgpg.tcl @man man/mann/gpg.n ----- End forwarded message ----- -- Dmitrij D. Czarkoff
