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

Newer, cleaner layout, consolidate include files

Browse Source 
into one dir, simplify modules dirs layout,
improved building wrt threads/compiler flags, etc.

ok landry@, sebastiap@
This commit is contained in:
stu 2011-01-05 16:19:48 +00:00
parent 1c3883a3b6
commit 2e98337877
5 changed files with 823 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lang/tcl/8.4/Makefile
View File

@ -1,18 +1,13 @@
# $OpenBSD: Makefile,v 1.25 2010/11/27 11:54:53 espie Exp $
# $OpenBSD: Makefile,v 1.26 2011/01/05 16:19:48 stu Exp $
COMMENT = Tool Command Language
V = 8.4.19
DISTNAME = tcl${V}
PKGNAME = tcl-${V}
REVISION = 0
DISTNAME = tcl8.4.19
PKGNAME = tcl-8.4.19
REVISION = 1
SHARED_LIBS = tcl84 1.1
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
# BSD
@ -26,10 +21,8 @@ WANTLIB = c m
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
DISTFILES = ${DISTNAME}-src.tar.gz
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
MAKE_FLAGS += TCL_BUILD_EXP_FILE="libtcl84.a" \
TCL_EXP_FILE="libtcl84.a"
.endif
MAKE_FLAGS += TCL_PACKAGE_PATH='$$(prefix)/lib/tcl' \
TCL_LIBRARY='$$(prefix)/lib/tcl/tcl$$(VERSION)'
FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
INSTALL_LIBRARY="${INSTALL_DATA}" \
@ -37,23 +30,31 @@ FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
REGRESS_FLAGS = HOME=${TESTHOME}
SEPARATE_BUILD = concurrent
AUTOCONF_VERSION = 2.13
USE_GROFF = Yes
CONFIGURE_STYLE = autoconf no-autoheader old
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--includedir="${LOCALBASE}/include/tcl8.4" \
--mandir="${LOCALBASE}/lib/tcl8.4/man" \
--includedir="${PREFIX}/include/tcl8.4" \
--mandir="${PREFIX}/man/tcl8.4" \
--sysconfdir="${SYSCONFDIR}" \
--enable-man-symlinks
CONFIGURE_ENV += SHLIB_VERSION="${LIBtcl84_VERSION}" \
CFLAGS=""
USE_GROFF = Yes
EXTRA_INSTALL="install-private-headers"
# Needs a full network connection to run?
#REGRESS_IS_INTERACTIVE=Yes
AUTOCONF_VERSION = 2.13
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
ALL_TARGET = all libtcl84.a
CONFIGURE_ENV += EXTRA_INSTALL_BINARIES='@echo "Installing libtcl84.a to $$(LIB_INSTALL_DIR)/" \
&& $$(INSTALL_DATA) libtcl84.a $$(LIB_INSTALL_DIR)/libtcl84.a \
&& (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtcl84.a)'
.endif
.if ${MACHINE_ARCH} == "sh"
CFLAGS += -O0
.endif
WRKSRC = ${WRKDIST}/unix
REGRESS_TARGET = test
@ -64,6 +65,7 @@ pre-regress:
@mkdir -p ${TESTHOME}
post-install:
${INSTALL_DATA} ${WRKDIST}/license.terms ${PREFIX}/man/tcl8.4
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
ln -s libtcl84.a ${PREFIX}/lib/libtcl84_pic.a
ln -s libtclstub84.a ${PREFIX}/lib/libtclstub84_pic.a

18
lang/tcl/8.4/patches/patch-library_init_tcl Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-library_init_tcl,v 1.1 2011/01/05 16:19:48 stu Exp $
--- library/init.tcl.orig Sun Oct 3 09:43:48 2010
+++ library/init.tcl Sun Oct 3 09:44:27 2010
@@ -55,11 +55,14 @@ namespace eval tcl {
}
}
}
+# OpenBSD layout
+if {0} {
set Dir [file join [file dirname [file dirname \
[info nameofexecutable]]] lib]
if {[lsearch -exact $::auto_path $Dir] < 0} {
lappend ::auto_path $Dir
}
+}
if {[info exists ::tcl_pkgPath]} {
foreach Dir $::tcl_pkgPath {
if {[lsearch -exact $::auto_path $Dir] < 0} {

79
lang/tcl/8.4/patches/patch-unix_Makefile_in
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
$OpenBSD: patch-unix_Makefile_in,v 1.2 2011/01/05 16:19:48 stu Exp $
--- unix/Makefile.in.orig Thu Apr 17 16:29:49 2008
+++ unix/Makefile.in Sun Sep 28 01:04:05 2008
+++ unix/Makefile.in Sun Oct 3 08:48:18 2010
@@ -485,6 +485,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
+${TCL_BUILD_EXP_FILE}: ${OBJS}
+libtcl84.a: ${OBJS}
+ rm -f $@
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
+
# Make target which outputs the list of the .o contained in the Tcl lib
# usefull to build a single big shared library containing Tcl and other
# extensions. used for the Tcl Plugin. -- dl
@@ -620,30 +624,26 @@ install-strip:
@@ -620,21 +624,16 @@ install-strip:
# possible (e.g. if installing as root).
install-binaries: binaries
@ -36,8 +36,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
$(LIB_INSTALL_DIR)/$(TCL_EXP_FILE); \
+ (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(TCL_EXP_FILE)); \
@@ -642,8 +641,8 @@ install-binaries: binaries
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@ -48,13 +47,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
@@ -651,12 +651,12 @@ install-binaries: binaries
@EXTRA_INSTALL_BINARIES@
install-libraries: libraries
- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR) \
+ $(INCLUDE_INSTALL_DIR)/generic $(INCLUDE_INSTALL_DIR)/unix; \
@@ -655,8 +654,7 @@ install-libraries: libraries
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@ -64,7 +57,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
else true; \
fi; \
done;
@@ -664,23 +664,30 @@ install-libraries: libraries
@@ -664,14 +662,10 @@ install-libraries: libraries
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@ -80,20 +73,8 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
@echo "Installing header files";
@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
$(GENERIC_DIR)/tclPlatDecls.h; \
do \
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ cd $(INCLUDE_INSTALL_DIR)/generic && ln -sf ../`basename $$i` ./`basename $$i`; \
@@ -680,7 +674,7 @@ install-libraries: libraries
done;
+ @for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
+ $(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclMath.h \
+ $(GENERIC_DIR)/tclPort.h ; \
+ do \
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/generic; \
+ done;
+ @for i in $(UNIX_DIR)/tclUnixPort.h; \
+ do \
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/unix; \
+ done;
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
- $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
@ -101,7 +82,14 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
do \
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
done;
@@ -722,8 +729,7 @@ install-doc: doc
@@ -715,31 +709,27 @@ install-libraries: libraries
done;
install-doc: doc
- @if test ! -x $(UNIX_DIR)/installManPage; then \
- chmod +x $(UNIX_DIR)/installManPage; \
- fi
@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@ -111,3 +99,38 @@ $OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
else true; \
fi; \
done;
@echo "Installing and cross-linking top-level (.1) docs";
@for i in $(TOP_DIR)/doc/*.1; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
done
@echo "Installing and cross-linking C API (.3) docs";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
done
@echo "Installing and cross-linking command (.n) docs";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
done
# Optional target to install private headers
@@ -748,14 +738,10 @@ install-private-headers: libraries
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
- mkdir -p $$i; \
- chmod 755 $$i; \
+ ${INSTALL_DATA_DIR} $$i; \
else true; \
fi; \
done;
- @if test ! -x $(SRC_DIR)/install-sh; then \
- chmod +x $(SRC_DIR)/install-sh; \
- fi
@echo "Installing private header files";
@for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
$(GENERIC_DIR)/tclIntPlatDecls.h \

12
lang/tcl/8.4/patches/patch-unix_tclConfig_sh_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-unix_tclConfig_sh_in,v 1.1 2009/01/16 00:02:13 sthen Exp $
--- unix/tclConfig.sh.in.orig Sat Sep 27 14:26:16 2008
+++ unix/tclConfig.sh.in Sat Sep 27 14:26:48 2008
@@ -146,7 +146,7 @@ TCL_UNSHARED_LIB_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@
# different place than the directory containing the source files, this
# points to the location of the sources, not the location where Tcl was
# compiled.
-TCL_SRC_DIR='@TCL_SRC_DIR@'
+TCL_SRC_DIR='@includedir@'
# List of standard directories in which to look for packages during
# "package require" commands. Contains the "prefix" directory plus also

1463
lang/tcl/8.4/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff