cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to new Tcl layout.

Browse Source 
get rid of USE_GROFF.

OK landry@, stu@
This commit is contained in:
sebastia 2011-01-05 18:45:45 +00:00
parent fc6dc7e8d7
commit 2007c60f6d
4 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lang/expect/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.56 2010/11/08 09:28:25 espie Exp $
# $OpenBSD: Makefile,v 1.57 2011/01/05 18:45:45 sebastia Exp $
COMMENT= sophisticated scripter based on Tcl/Tk
REVISION = 0
DISTNAME= expect-5.44.1.15
SHARED_LIBS= expect544115 0.0
CATEGORIES= lang
@ -25,13 +26,12 @@ SEPARATE_BUILD= simple
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE=autoconf no-autoheader gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
USE_GROFF = Yes
CFLAGS+= -I${X11BASE}/include
CONFIGURE_ARGS+=--with-tclconfig="${MODTCL_LIBDIR}" \
--with-tclinclude="${MODTCL_INCDIR}"
CONFIGURE_ENV+= LIBexpect544115_VERSION=${LIBexpect544115_VERSION}
MAKE_FLAGS= LIB_RUNTIME_DIR=$(TRUEPREFIX)/lib/${DISTNAME:S/-//}
CONFIGURE_ENV+= LIBexpect544115_VERSION=${LIBexpect544115_VERSION} \
CFLAGS="-I${MODTCL_INCDIR} -I${X11BASE}/include"
.if !${FLAVOR:L:Mno_tk}
MODULES= x11/tk
@ -40,15 +40,17 @@ WANTLIB+= Xau Xdmcp Xext Xft Xrender Xss expat fontconfig freetype
MAKE_FLAGS+= TK=Yes
LIB_DEPENDS += ${MODTK_LIB_DEPENDS}
WANTLIB += ${MODTK_WANTLIB}
CONFIGURE_ARGS+=--with-tk="${MODTK_LIBDIR}" \
CONFIGURE_ARGS+=--libdir=${MODTCL_TCLDIR} \
--with-tk="${MODTK_LIBDIR}" \
--with-tkinclude="${MODTK_INCDIR}"
.else
MODULES = lang/tcl
LIB_DEPENDS += ${MODTCL_LIB_DEPENDS}
WANTLIB += ${MODTCL_WANTLIB}
CONFIGURE_ARGS +=--with-tk=no
CONFIGURE_ARGS +=--with-tk=no --libdir=${MODTCL_TCLDIR}
.endif
REGRESS_TARGET= test
FAKE_FLAGS = PKG_DIR=expect
REGRESS_TARGET = test
.include <bsd.port.mk>

30
lang/expect/patches/patch-Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.3 2010/09/24 14:16:50 sebastia Exp $
$OpenBSD: patch-Makefile_in,v 1.4 2011/01/05 18:45:45 sebastia Exp $
allow to build with --with-tk=no to please the no_tk flavor
propagate the -lutil via @LIBS@, otherwise it will break
at least on vax
--- Makefile.in.orig Thu Mar 11 20:06:30 2010
+++ Makefile.in Fri Sep 24 09:52:53 2010
+++ Makefile.in Thu Dec 23 10:17:52 2010
@@ -103,7 +103,11 @@ PKG_LIB_FILE = @PKG_LIB_FILE@
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
@ -19,6 +19,15 @@ at least on vax
BINARIES = $(lib_BINARIES) $(bin_BINARIES)
SHELL = @SHELL@
@@ -120,7 +124,7 @@ includedir = @includedir@
DESTDIR =
-PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
+PKG_DIR = $(PACKAGE_NAME)
pkgdatadir = $(datadir)/$(PKG_DIR)
pkglibdir = $(libdir)/$(PKG_DIR)
pkgincludedir = $(includedir)/$(PKG_DIR)
@@ -413,7 +417,8 @@ expect: exp_main_exp.o $(PKG_LIB_FILE)
@TCL_LIB_SPEC@ \
@DL_LIBS@ @PKG_LIBS@ @MATH_LIBS@ \
@ -39,3 +48,20 @@ at least on vax
$(SETUID) expectk
#========================================================================
@@ -555,12 +561,12 @@ install-lib-binaries:
@mkdir -p $(DESTDIR)$(pkglibdir)
@list='$(lib_BINARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/../../$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/../../$$p; \
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
if test "x$$stub" = "xstub"; then \
- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/../../$$p"; \
+ $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/../../$$p; \
else \
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \

9
lang/expect/patches/patch-pkgIndex_in Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-pkgIndex_in,v 1.1 2011/01/05 18:45:45 sebastia Exp $
--- pkgIndex.in.orig Thu Dec 23 10:12:51 2010
+++ pkgIndex.in Thu Dec 23 10:13:04 2010
@@ -7,4 +7,4 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.
-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir ../.. @EXP_SHARED_LIB_FILE@]]

9
lang/expect/pkg/PFRAG.shared
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.9 2010/09/24 14:16:50 sebastia Exp $
lib/expect5.44.1.15/
@lib lib/expect5.44.1.15/libexpect544115.so.${LIBexpect544115_VERSION}
lib/expect5.44.1.15/pkgIndex.tcl
@comment $OpenBSD: PFRAG.shared,v 1.10 2011/01/05 18:45:45 sebastia Exp $
@lib lib/libexpect544115.so.${LIBexpect544115_VERSION}
lib/tcl/
lib/tcl/expect/
lib/tcl/expect/pkgIndex.tcl