Update to new Tcl layout.

OK landry@ stu@
This commit is contained in:
sebastia 2011-01-05 18:00:10 +00:00
parent f26b31718c
commit d5f0abdb34
4 changed files with 28 additions and 24 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2010/11/20 19:56:47 espie Exp $
# $OpenBSD: Makefile,v 1.11 2011/01/05 18:00:10 sebastia Exp $
COMMENT-main= IAX client library
COMMENT-tcl= IAX client library, tcl bindings
@ -8,7 +8,7 @@ DISTNAME= iaxclient-2.1beta3
PKGNAME-main= ${DISTNAME}
REVISION-main= 2
PKGNAME-tcl= ${DISTNAME:S/iaxclient/iaxclient-tcl/}
REVISION-tcl= 2
REVISION-tcl= 3
PKGNAME-iaxcomm= iaxcomm-1.1.0
REVISION-iaxcomm= 3
@ -86,6 +86,7 @@ CONFIGURE_ARGS=--enable-clients="testcall tkphone iaxcomm"
# ALLOW_SMP_DANGERS is at least needed on sparc64 and mips64
CFLAGS+= -I${LOCALBASE}/include -DALLOW_SMP_DANGERS
MAKE_ENV= LDFLAGS='-L/usr/lib -lossaudio'
FAKE_FLAGS = iaxclidir=${MODTCL_TCLDIR}/tkphone
pre-configure:
@# non-standard, not using MODTCL_WISH_ADJ
@ -96,9 +97,12 @@ pre-configure:
post-build:
cd ${WRKSRC}/contrib/tcl && ${CONFIGURE_ENV} ./configure \
--with-tcl=${MODTCL_LIBDIR} && ${MAKE_PROGRAM}
--libdir=${MODTCL_TCLDIR} --with-tcl=${MODTCL_LIBDIR} \
&& ${MAKE_PROGRAM}
post-install:
cd ${WRKSRC}/contrib/tcl && ${MAKE_PROGRAM} install
cd ${WRKSRC}/contrib/tcl && \
${MAKE_PROGRAM} install PKG_DIR=tcliaxclient \
iaxclidir=${MODTCL_TCLDIR}/tkphone
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-simpleclient_tkphone_tkiaxphone,v 1.1 2010/06/18 17:32:21 sebastia Exp $
--- simpleclient/tkphone/tkiaxphone.orig Mon Apr 7 17:05:28 2008
+++ simpleclient/tkphone/tkiaxphone Wed Dec 9 23:54:06 2009
$OpenBSD: patch-simpleclient_tkphone_tkiaxphone,v 1.2 2011/01/05 18:00:10 sebastia Exp $
--- simpleclient/tkphone/tkiaxphone.orig Mon Apr 7 18:05:28 2008
+++ simpleclient/tkphone/tkiaxphone Sun Dec 12 13:17:17 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@ -29,7 +29,7 @@ $OpenBSD: patch-simpleclient_tkphone_tkiaxphone,v 1.1 2010/06/18 17:32:21 sebast
set base $env(IAXPHONEHOME)
} else {
- set base [file dirname [file join [pwd] $argv0]]
+ set base "${LOCALBASE}/lib/iaxclient/tkphone"
+ set base "${LOCALBASE}/lib/tcl/tkphone"
}
set result [file join $base $file]
debug "$result"

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-tcl,v 1.1 2010/06/18 17:32:21 sebastia Exp $
@lib lib/tcliaxclient0.2/libtcliaxclient02.so.${LIBtcliaxclient02_VERSION}
@comment $OpenBSD: PFRAG.shared-tcl,v 1.2 2011/01/05 18:00:10 sebastia Exp $
@lib lib/tcl/tcliaxclient/libtcliaxclient02.so.${LIBtcliaxclient02_VERSION}

View File

@ -1,16 +1,16 @@
@comment $OpenBSD: PLIST-tcl,v 1.1 2010/06/18 17:32:21 sebastia Exp $
@comment $OpenBSD: PLIST-tcl,v 1.2 2011/01/05 18:00:10 sebastia Exp $
%%SHARED%%
bin/tkiaxphone
lib/iaxclient/
lib/iaxclient/tkphone/
@bin lib/iaxclient/tkphone/iaxcli
lib/iaxclient/tkphone/monitor.ui
lib/iaxclient/tkphone/monitor.ui.tcl
lib/iaxclient/tkphone/phone.ui
lib/iaxclient/tkphone/phone.ui.tcl
lib/iaxclient/tkphone/pref.ui
lib/iaxclient/tkphone/pref.ui.tcl
lib/iaxclient/tkphone/tkiaxphone
lib/tcliaxclient0.2/
lib/tcliaxclient0.2/iaxclient.tcl
lib/tcliaxclient0.2/pkgIndex.tcl
lib/tcl/
lib/tcl/tkphone/
@bin lib/tcl/tkphone/iaxcli
lib/tcl/tcliaxclient/
lib/tcl/tcliaxclient/iaxclient.tcl
lib/tcl/tcliaxclient/pkgIndex.tcl
lib/tcl/tkphone/monitor.ui
lib/tcl/tkphone/monitor.ui.tcl
lib/tcl/tkphone/phone.ui
lib/tcl/tkphone/phone.ui.tcl
lib/tcl/tkphone/pref.ui
lib/tcl/tkphone/pref.ui.tcl
lib/tcl/tkphone/tkiaxphone