mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Update to 1.6.6

Browse Source 
- Add dependency on expat
This commit is contained in:
Martin Matuska 2010-05-11 09:44:49 +00:00
parent a04231de18
commit 11026b2530
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=254123
5 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/xotcl/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= xotcl
PORTVERSION= 1.6.5
PORTVERSION= 1.6.6
CATEGORIES?= lang tcl
MASTER_SITES= SF \
http://media.wu-wien.ac.at/download/
@ -30,6 +30,9 @@ PORTDOCS= *
OPTIONS= ACTIWEB "Include actiweb" on \
TUTORIAL "Install XOTcl tutorial" off
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include,${LOCALBASE}/lib
.else
AOLSERVERBASE?= aolserver
.endif
@ -72,7 +75,9 @@ CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \
--with-tclinclude=${TCL_INCLUDEDIR}/generic/ \
--with-xotclsh
CONFIGURE_ENV+= TCL_INCLUDEDIR=${TCL_INCLUDEDIR}
CONFIGURE_ENV+= TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
post-patch:
@${REINPLACE_CMD} -e 's|TCLSH_PROG=".*"|TCLSH_PROG="${TCLSH}"|g' \

6
lang/xotcl/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xotcl-1.6.5.tar.gz) = 7e903c77d9f40cac2605ab84223b4dba
SHA256 (xotcl-1.6.5.tar.gz) = 2077c9216feadefb62e6bad2529a615c55ba064b3a68e31e4da20b7c875e17de
SIZE (xotcl-1.6.5.tar.gz) = 1918948
MD5 (xotcl-1.6.6.tar.gz) = 326502cbaf9959c9cc579ba96f284788
SHA256 (xotcl-1.6.6.tar.gz) = 40f0eb7068aca0fe344b284019e0570eed928654b95b696805b3796be495c040
SIZE (xotcl-1.6.6.tar.gz) = 1923067

30
lang/xotcl/files/patch-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig 2007-08-06 13:35:56.000000000 +0200
+++ Makefile.in 2007-08-13 16:13:07.000000000 +0200
@@ -262,11 +262,11 @@
--- Makefile.in.orig 2009-03-04 16:11:13.000000000 +0100
+++ Makefile.in 2010-05-11 10:36:59.435600858 +0200
@@ -264,11 +264,11 @@
#========================================================================
# This rule installs platform-independent files, such as header files.
#========================================================================
@ -15,7 +15,7 @@
done;
@echo "Installing Libraries to $(DESTDIR)$(pkglibdir)/"
@for i in $(libdirs) ; do \
@@ -284,7 +284,7 @@
@@ -286,7 +286,7 @@
$(INSTALL_DATA) $(src_lib_dir)/$$i $(DESTDIR)$(pkglibdir)/$$i ; \
done;
cat unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
@ -24,7 +24,25 @@
@echo "Installing Applications to $(DESTDIR)$(pkglibdir)/apps/"
@for i in $(appdirs) ; do \
echo " Installing $$i/" ; \
@@ -543,7 +543,6 @@
@@ -430,13 +430,15 @@
$(CC) -rdynamic -o $@ tclAppInit.o \
$(PKG_OBJECTS) \
$(CFLAGS) $(TCL_LIB_SPEC) \
- $(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
+ $(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS) \
+ $(LDFLAGS_DEFAULT)
xowish: tkAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
$(CC) -rdynamic -o $@ tkAppInit.o \
$(PKG_OBJECTS) \
$(CFLAGS) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) \
- $(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
+ $(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS) \
+ $(LDFLAGS_DEFAULT)
install-shells:
@if test -f xotclsh; then \
@@ -550,7 +552,6 @@
else \
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
@ -32,7 +50,7 @@
fi; \
ext=`echo $$p|sed -e "s/.*\.//"`; \
if test "x$$ext" = "xdll"; then \
@@ -600,12 +599,12 @@
@@ -607,12 +608,12 @@
rm -f $(DESTDIR)$(bindir)/$$p; \
done

24
lang/xotcl/files/patch-configure
View File

@ -1,15 +1,11 @@
--- configure.orig 2007-09-22 09:28:35.000000000 +0200
+++ configure 2007-09-22 09:29:34.000000000 +0200
@@ -6676,9 +6676,9 @@
;;
esac
else
- if test ! -f "${TCL_SRC_DIR}/generic/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;}
+ if test ! -f "${TCL_INCLUDEDIR}/generic/tclInt.h" ; then
+ { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_INCLUDEDIR}" >&5
+echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_INCLUDEDIR}" >&2;}
--- configure.orig 2010-03-06 11:14:38.000000000 +0100
+++ configure 2010-05-11 10:30:25.126687046 +0200
@@ -7341,7 +7342,7 @@
esac
result="Using ${TCL_INCLUDES}"
else
- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
+ if test ! -f "${TCL_INCLUDEDIR}/generic/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; }; }
fi
fi

6
lang/xotcl/pkg-plist
View File

@ -64,7 +64,7 @@
%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/server.key
%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/server.pem
%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/persistence/persistenceTest.xotcl
%%ACTIWEB%%lib/xotclexpat0.9/libxotclexpat0.9.so
%%ACTIWEB%%lib/xotclexpat0.9/libxotclexpat.so.1
%%ACTIWEB%%lib/xotclexpat0.9/pkgIndex.tcl
%%ACTIWEB%%lib/xotclsdbm1.2/libxotclsdbm1.2.so
%%ACTIWEB%%lib/xotclsdbm1.2/pkgIndex.tcl
@ -132,8 +132,8 @@ lib/xotcl%%PORTVERSION%%/lib/trace.xotcl
lib/xotcl%%PORTVERSION%%/lib/upvarcompat.xotcl
lib/xotcl%%PORTVERSION%%/lib/wafecompat.tcl
lib/xotcl%%PORTVERSION%%/lib/xodoc.xotcl
lib/xotcl%%PORTVERSION%%/libxotcl%%PORTVERSION%%.so
lib/xotcl%%PORTVERSION%%/libxotclstub%%PORTVERSION%%.a
lib/xotcl%%PORTVERSION%%/libxotcl.so.1
lib/xotcl%%PORTVERSION%%/libxotclstub.a
lib/xotcl%%PORTVERSION%%/pkgIndex.tcl
lib/xotcl%%PORTVERSION%%/serialize/RecoveryPoint.xotcl
lib/xotcl%%PORTVERSION%%/serialize/ScriptCreator.xotcl