Update to new Tcl layout.

While there, take MAINTAINER, since the old one is not reachable with this address anymore. OK landry@, stu@
2011-01-05 18:55:31 +00:00 · 2011-01-05 18:55:31 +00:00 · 2240f32ac8
commit 2240f32ac8
parent 946c842914
6 changed files with 74 additions and 26 deletions
--- a/devel/itcl/Makefile
+++ b/devel/itcl/Makefile
@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/18 21:35:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2011/01/05 18:55:31 sebastia Exp $

 COMMENT=	object-oriented extensions to Tcl

+REVISION =	0
 VERSION=	3.4
 DISTNAME=	itcl${VERSION}b1
 PKGNAME=	itcl-${VERSION}b1
@ -11,7 +12,7 @@ CATEGORIES=	devel

 HOMEPAGE=	http://incrtcl.sourceforge.net/itcl/

-MAINTAINER=	Nikns Siankin <nikns@secure.lv>
+MAINTAINER=	Sebastian Reitenbach <sebastia@openbsd.org>

 # BSD style
 PERMIT_PACKAGE_CDROM=	Yes
@ -33,16 +34,18 @@ WRKDIST=	${WRKDIR}/itcl${VERSION}
 CONFIGURE_STYLE=gnu

 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--libdir=${MODTCL_TCLDIR} \
 		--with-tcl=${MODTCL_LIBDIR} \
-		--includedir=${PREFIX}/include/itcl${VERSION} \
-		--libdir=${PREFIX}/lib/itcl${VERSION}
+		--with-tclinclude=${MODTCL_INCDIR} \
+		--includedir=${PREFIX}/include/itcl

 CONFIGURE_ENV=	CPPFLAGS="-I${MODTCL_INCDIR}/generic \
-		-I${MODTCL_INCDIR}/unix" \
+		-I${MODTCL_INCDIR}/unix -I${MODTCL_INCDIR}" \
 		LIBitcl34_VERSION=${LIBitcl34_VERSION}
-USE_GROFF =	Yes
+FAKE_FLAGS =	libdir=${MODTCL_TCLDIR}/itcl

-SUBST_VARS=VERSION
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/configure

 do-regress:
 	@cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
--- a/devel/itcl/patches/patch-Makefile_in
+++ b/devel/itcl/patches/patch-Makefile_in
@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2010/06/07 14:39:46 sthen Exp $
+$OpenBSD: patch-Makefile_in,v 1.3 2011/01/05 18:55:31 sebastia Exp $
 --- Makefile.in.orig	Mon Dec 15 21:02:58 2008
 +++ Makefile.in	Sun Jun  6 12:36:40 2010
@@ -77,7 +77,7 @@ DESTDIR		=
@ -16,14 +16,14 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/06/07 14:39:46 sthen Exp $
 	  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; \
+	    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; \
+		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/../../$$p"; \
+		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/../../$$p; \
 	    else \
 		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
 		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
--- a/devel/itcl/patches/patch-configure
+++ b/devel/itcl/patches/patch-configure
@ -1,6 +1,24 @@
-$OpenBSD: patch-configure,v 1.2 2010/06/07 14:39:46 sthen Exp $
+$OpenBSD: patch-configure,v 1.3 2011/01/05 18:55:31 sebastia Exp $
 --- configure.orig	Fri May 25 00:15:40 2007
-+++ configure	Sun Jun  6 12:37:28 2010
+++ configure	Thu Dec 23 14:42:37 2010
+@@ -6340,7 +6340,7 @@ fi
+ 
+     echo "$as_me:$LINENO: checking for Tcl private include files" >&5
+ echo $ECHO_N "checking for Tcl private include files... $ECHO_C" >&6
+-
+    TCL_SRC_DIR=${LOCALBASE}/include/tcl8.5
+     TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
+     TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\"
+     TCL_GENERIC_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/generic\"
+@@ -6369,7 +6369,7 @@ echo $ECHO_N "checking for Tcl private include files..
+ 	        ;;
+ 	esac
+     else
+-	if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
+	if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
+ 	    { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
+ echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
+    { (exit 1); exit 1; }; }
@@ -7729,7 +7729,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
 	    DL_LIBS=""
 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@ -15,7 +33,19 @@ $OpenBSD: patch-configure,v 1.2 2010/06/07 14:39:46 sthen Exp $
 
 # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
 -eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
-+eval pkglibdir="${libdir}"
+eval pkglibdir="${libdir}/${PACKAGE_NAME}"
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
     eval itcl_LIB_FLAG="-litcl${PACKAGE_VERSION}${DBGX}"
     eval itcl_STUB_LIB_FLAG="-litclstub${PACKAGE_VERSION}${DBGX}"
+@@ -9489,9 +9489,9 @@ itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
+ itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+ 
+ itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
+-itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
+itcl_STUB_LIB_SPEC="-L${pkglibdir}/../../ ${itcl_STUB_LIB_FLAG}"
+ itcl_BUILD_STUB_LIB_PATH="`pwd`/${itcl_STUB_LIB_FILE}"
+-itcl_STUB_LIB_PATH="${pkglibdir}/${itcl_STUB_LIB_FILE}"
+itcl_STUB_LIB_PATH="${pkglibdir}/../../${itcl_STUB_LIB_FILE}"
+ 
+ 
+ 
--- a/devel/itcl/patches/patch-generic_itcl_cmds_c
+++ b/devel/itcl/patches/patch-generic_itcl_cmds_c
@ -0,0 +1,15 @@
+$OpenBSD: patch-generic_itcl_cmds_c,v 1.3 2011/01/05 18:55:31 sebastia Exp $
+
+On OpenBSD we only have one version installed.
+
+--- generic/itcl_cmds.c.orig	Sun Dec 12 12:25:58 2010
+++ generic/itcl_cmds.c	Sun Dec 12 12:26:47 2010
+@@ -62,7 +62,7 @@ namespace eval ::itcl {\n\
+             if {[info exists env(ITCL_LIBRARY)]} {\n\
+                 lappend dirs $env(ITCL_LIBRARY)\n\
+             }\n\
+-            lappend dirs [file join [file dirname $tcl_library] itcl$version]\n\
+            lappend dirs [file join [file dirname $tcl_library] itcl]\n\
+             set bindir [file dirname [info nameofexecutable]]\n\
+             lappend dirs [file join $bindir .. lib itcl$version]\n\
+             lappend dirs [file join $bindir .. library]\n\
--- a/devel/itcl/patches/patch-pkgIndex_tcl_in
+++ b/devel/itcl/patches/patch-pkgIndex_tcl_in
@ -4,4 +4,4 @@
 # Tcl package index file, version 1.0
 
 -package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
-+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir .. "@PKG_LIB_FILE@"] Itcl]
+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir ../.. "@PKG_LIB_FILE@"] Itcl]
--- a/devel/itcl/pkg/PLIST
+++ b/devel/itcl/pkg/PLIST
@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/06/07 14:39:46 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2011/01/05 18:55:32 sebastia Exp $
 %%SHARED%%
-include/itcl${VERSION}/
-include/itcl${VERSION}/itcl.h
-include/itcl${VERSION}/itclDecls.h
-include/itcl${VERSION}/itclInt.h
-include/itcl${VERSION}/itclIntDecls.h
-lib/itcl${VERSION}/
-lib/itcl${VERSION}/itcl.tcl
-lib/itcl${VERSION}/itclConfig.sh
-lib/itcl${VERSION}/pkgIndex.tcl
+include/itcl/
+include/itcl/itcl.h
+include/itcl/itclDecls.h
+include/itcl/itclInt.h
+include/itcl/itclIntDecls.h
 lib/libitclstub34.a
+lib/tcl/itcl/
+lib/tcl/itcl/itcl.tcl
+lib/tcl/itcl/itclConfig.sh
+lib/tcl/itcl/pkgIndex.tcl
@man man/mann/body.n
@man man/mann/class.n
@man man/mann/code.n