Update to 2.1.

Install examples.
Man page is ok without groff.
Stop treating a loadable lib as a linkable lib.
This commit is contained in:
stu 2015-07-13 00:56:55 +00:00
parent 36ce279d3a
commit 13485d32a7
6 changed files with 73 additions and 20 deletions

View File

@ -1,38 +1,50 @@
# $OpenBSD: Makefile,v 1.5 2015/04/04 09:21:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2015/07/13 00:56:55 stu Exp $
SHARED_ONLY = Yes
COMMENT = dbus bindings for Tcl
DISTNAME = dbus-tcl1.1
PKGNAME = dbus-tcl-1.1
SHARED_LIBS = dbus-tcl11 0.0
V = 2.1
DISTNAME = dbus-tcl-${V}
CATEGORIES = x11
HOMEPAGE = http://dbus-tcl.sourceforge.net/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
REVISION = 1
# ISC
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c dbus-1 pthread
WANTLIB = dbus-1
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=dbus-tcl/}
DISTFILES = dbus-tcl{dbus}-${V}.tar.gz
MODULES = lang/tcl
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} devel/tcllib
LIB_DEPENDS = x11/dbus
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_DATA}"
FAKE_FLAGS = INSTALL_PROGRAM='$${INSTALL_DATA}' \
PACKAGE_NAME=dbus-tcl \
PACKAGE_TARNAME=dbus-tcl \
pkglibdir='$$(libdir)/tcl/$$(PACKAGE_NAME)'
TEST_FLAGS = LD_PRELOAD=/usr/lib/libpthread.so
SEPARATE_BUILD =Yes
USE_GROFF = Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR} \
--mandir=${PREFIX}/man \
--enable-threads \
SHLIB_VERSION=${LIBdbus-tcl11_VERSION}
--mandir='$${prefix}/man' \
--enable-threads
TEST_IS_INTERACTIVE = X11
TEST_TARGET = test
WRKDIST = ${WRKDIR}/dbus-${V}
TEST_TARGET = test
pre-configure:
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/demos/{dbusmon,qdbus}.tcl
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dbus-tcl
${INSTALL_SCRIPT} ${WRKSRC}/demos/{dbusmon,qdbus}.tcl \
${PREFIX}/share/examples/dbus-tcl
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (dbus-tcl1.1.tar.gz) = YiB3rMtVWVA0yy7QLlxCdgKY/m56iNg+Gap4bK3wR6k=
SIZE (dbus-tcl1.1.tar.gz) = 156049
SHA256 (dbus-tcl-2.1.tar.gz) = gsEWy3twzdcYPhBU8sUjY6q3xgi1+zdduxKfCAc04tA=
SIZE (dbus-tcl-2.1.tar.gz) = 173734

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1 2015/07/13 00:56:55 stu Exp $
--- Makefile.in.orig Sat Aug 17 11:28:45 2013
+++ Makefile.in Wed Apr 29 15:41:02 2015
@@ -205,10 +205,10 @@ libraries:
doc: doc/dbus.n doc/dbus.html
doc/dbus.n: $(srcdir)/doc/dbus.man
- $(DTPLITE) -o $@ nroff $+
+ $(DTPLITE) -o $@ nroff $+ $>
doc/dbus.html: $(srcdir)/doc/dbus.man
- $(DTPLITE) -o $@ html $+
+ $(DTPLITE) -o $@ html $+ $>
install: all install-binaries install-libraries @INSTALLDOC@

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2015/07/13 00:56:55 stu Exp $
--- configure.orig Thu Oct 9 15:25:52 2014
+++ configure Thu Oct 9 15:26:01 2014
@@ -7216,7 +7216,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

View File

@ -1,9 +1,12 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:58 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/07/13 00:56:55 stu Exp $
lib/tcl/dbus-tcl/
@lib lib/tcl/dbus-tcl/libdbus-tcl11.so.${LIBdbus-tcl11_VERSION}
lib/tcl/dbus-tcl/libdbus.so
lib/tcl/dbus-tcl/pkgIndex.tcl
@man man/mann/dbus-tcl.n
@man man/mann/dbus.n
share/doc/dbus-tcl/
share/doc/dbus-tcl/dbus-tcl.html
share/doc/dbus-tcl/dbus.html
share/doc/dbus-tcl/license.terms
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/dbus-tcl/
share/examples/dbus-tcl/dbusmon.tcl
share/examples/dbus-tcl/qdbus.tcl

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1.1.1 2012/08/08 11:45:03 stu Exp $
$OpenBSD: README,v 1.2 2015/07/13 00:56:55 stu Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -7,3 +7,13 @@ $OpenBSD: README,v 1.1.1.1 2012/08/08 11:45:03 stu Exp $
If used with non-threaded Tcl or an executable that is
not linked with libpthread then it will be necessary to
set "LD_PRELOAD=/usr/lib/libpthread.so" in the environment.
As of version 2.0:
The 'dbus-tcl' Tcl package is now called 'dbus'.
Man and doc files dbus-tcl.n and dbus-tcl.html are
now dbus.n and dbus.html, respectively.
All other port files and directories remain 'dbus-tcl'.
Occurrences of [package require dbus-tcl]
should be changed to [package require dbus].