Hi All,
I have updated amsn to the new version. It's works fine in my amd64.
The patch for tcltls allows to amsn using it. I don't know if other ports
use tcltls. How could I know all ports depending of tcltls ? I want to
check if tcltls ports it's okay.
Thanks,
BSDManiak
diff -urN /usr/ports/net/amsn/Makefile net/amsn/Makefile
--- /usr/ports/net/amsn/Makefile Sat Feb 2 22:17:49 2008
+++ net/amsn/Makefile Thu Jul 3 20:36:38 2008
@@ -2,7 +2,7 @@
COMMENT= open source MSN Messenger clone
-DISTNAME= amsn-0.97
+DISTNAME= amsn-0.97.1
CATEGORIES= net
HOMEPAGE= http://www.amsn-project.net/
@@ -20,26 +20,29 @@
LIB_DEPENDS= jpeg::graphics/jpeg \
png::graphics/png
-RUN_DEPENDS= :tk-8.4.*:x11/tk/8.4 \
+RUN_DEPENDS= :tk-${MODTK_VERSION}.*:x11/tk/${MODTK_VERSION} \
::security/tcltls \
::x11/bwidget \
:desktop-file-utils-*:devel/desktop-file-utils
-BUILD_DEPENDS= :tk-8.4.*:x11/tk/8.4 \
+BUILD_DEPENDS= :tk-${MODTK_VERSION}.*:x11/tk/${MODTK_VERSION} \
::security/tcltls
+MODULES+= x11/tk
+
USE_GMAKE= Yes
MAKE_FLAGS= verbose=yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \
- --with-tk=${LOCALBASE}/lib/tk8.4
+CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${MODTCL_VERSION} \
+ --with-tk=${LOCALBASE}/lib/tk${MODTK_VERSION}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-lm -L${LOCALBASE}/lib -fPIC" \
- TK_INC_SPEC="${LOCALBASE}/include/tk8.4/generic" \
- TCLSH="${LOCALBASE}/bin/tclsh8.4"
+ TK_INC_SPEC="${LOCALBASE}/include/tk${MODTK_VERSION}/generic" \
+ TCLSH="${LOCALBASE}/bin/tclsh${MODTCL_VERSION}"
pre-configure:
perl -pi -e 's|__LOCALBASE__|${LOCALBASE}|' ${WRKSRC}/amsn*
+ perl -pi -e 's|__TCL_VERSION__|${MODTCL_VERSION}|' ${WRKSRC}/amsn*
post-install:
.for a in amsn amsn-remote amsn-remote-CLI
diff -urN /usr/ports/net/amsn/distinfo net/amsn/distinfo
--- /usr/ports/net/amsn/distinfo Sat Feb 2 22:17:49 2008
+++ net/amsn/distinfo Thu Jul 3 19:50:41 2008
@@ -1,5 +1,5 @@
-MD5 (amsn-0.97.tar.bz2) = STYnr8LcONlFAEmensNEBA==
-RMD160 (amsn-0.97.tar.bz2) = dUFsmJffFZYPYWoNPiM8gnDem4s=
-SHA1 (amsn-0.97.tar.bz2) = ZzZMkKKxNHrr/1xNsOt0h3l+PM8=
-SHA256 (amsn-0.97.tar.bz2) = hJPVCTZKw4JbEGs/OMax8JYobOh79OWHGsAaLEOw70g=
-SIZE (amsn-0.97.tar.bz2) = 10131843
+MD5 (amsn-0.97.1.tar.bz2) = 7IjjmrYw3RxpmjcZhesRZg==
+RMD160 (amsn-0.97.1.tar.bz2) = Ps4tE5CJdtnbWk5jsO7S/DSbaxk=
+SHA1 (amsn-0.97.1.tar.bz2) = nDfBdKF8rQ3iKul3CPVUXNqLgMs=
+SHA256 (amsn-0.97.1.tar.bz2) = wMwNPHgtEIrwddShzpKfiLE5tcoruXPQ5lnVf5shiD0=
+SIZE (amsn-0.97.1.tar.bz2) = 3441503
diff -urN /usr/ports/net/amsn/patches/patch-Makefile_in net/amsn/patches/patch-Makefile_in
--- /usr/ports/net/amsn/patches/patch-Makefile_in Sat Feb 2 22:17:50 2008
+++ net/amsn/patches/patch-Makefile_in Thu Jul 3 20:06:36 2008
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/02/02 21:17:50 steven Exp $
---- Makefile.in.orig Mon Dec 24 22:25:59 2007
-+++ Makefile.in Sat Feb 2 19:37:03 2008
+--- Makefile.in.orig Thu Jul 3 19:56:15 2008
++++ Makefile.in Thu Jul 3 20:06:29 2008
@@ -11,10 +11,10 @@ STATIC := @STATIC@
doc_files := docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
@@ -14,7 +14,7 @@
FILES_TO_INSTALL += plugins utils/sexytile
FILES_TO_INSTALL += utils/log utils/uri utils/combobox
-@@ -77,7 +77,7 @@ USE_MMX := @USE_MMX@
+@@ -80,7 +80,7 @@ USE_MMX := @USE_MMX@
# build final cflags
CFLAGS := @CFLAGS@
ifeq (@DEBUG@,no)
@@ -23,34 +23,32 @@
else
CFLAGS += -g3 -DDEBUG
endif
-@@ -124,16 +124,24 @@ ifeq ($(FOUND_OS),linux)
+@@ -133,18 +133,18 @@ ifeq ($(FOUND_OS),linux)
FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/capture/capture.so utils/linux/capture/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/linux/capture/libng/plugins/drv0-v4l2.so utils/linux/capture/libng/plugins/drv1-v4l.so utils/linux/capture/libng/plugins/conv-mjpeg.so utils/linux/capture/libng/plugins/sn9c10x.so utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl
FILES_TO_EXCLUDE += AppMain.tcl
--else ifeq ($(FOUND_OS),bsd)
-+endif
+-else
+- ifeq ($(FOUND_OS),bsd)
++endif
++
+ifeq ($(FOUND_OS),bsd)
FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl
FILES_TO_EXCLUDE += AppMain.tcl
--else ifeq ($(FOUND_OS),solaris)
+- else
+- ifeq ($(FOUND_OS),solaris)
+endif
++
+ifeq ($(FOUND_OS),solaris)
FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/capture/capture.so utils/linux/capture/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/linux/capture/libng/plugins/drv0-v4l2.so utils/linux/capture/libng/plugins/conv-mjpeg.so utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl
FILES_TO_EXCLUDE += AppMain.tcl
+- endif
+- endif
endif
-+ifeq ($(FOUND_OS),bsd)
-+FILES_TO_INSTALL += utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/webcamsn/pkgIndex.tcl utils/webcamsn/webcamsn.so
-+FILES_TO_EXCLUDE += AppMain.tcl utils/linux/capture/test.tcl
-+endif
-+
-+
CONFIGURE_ARGS := @CONFIGURE_ARGS@
-
- #########################################################
-@@ -176,9 +184,9 @@ install:: $(FILES_TO_INSTALL)
+@@ -189,9 +189,9 @@ install:: $(FILES_TO_INSTALL)
rm -Rf $(DESTDIR)$(dstdir)/$(PACKAGE)/$$p; \
done
@@ -63,35 +61,55 @@
cp $(srcdir)/amsn.desktop $(DESTDIR)$(dstdir)/applications/
-@@ -254,13 +262,15 @@ ifeq ($(FOUND_OS),linux)
+@@ -271,33 +271,31 @@ ifeq ($(FOUND_OS),linux)
include $(tray_dir)/Rules.mk
include $(linflash_dir)/Rules.mk
endif
--else ifeq ($(FOUND_OS),bsd)
+-else
+- ifeq ($(FOUND_OS),mac)
+endif
++ifeq ($(FOUND_OS),mac)
+ include $(macosx_dir)/sndplay-src/Rules.mk
+ include $(macosx_dir)/growl1.0/Rules.mk
+ include $(macosx_dir)/growl1.0/src/Rules.mk
+ include $(macosx_dir)/tclCarbon/Rules.mk
+ include $(macosx_dir)/tclCarbon/src/Rules.mk
++endif
+ifeq ($(FOUND_OS),bsd)
- ifeq ($(FOUND_X11),yes)
- ADDLIBS += ${X_LIBS}
- include $(tray_dir)/Rules.mk
- include $(linflash_dir)/Rules.mk
++ ifeq ($(FOUND_X11),yes)
++ ADDLIBS += ${X_LIBS}
++ include $(tray_dir)/Rules.mk
++ include $(linflash_dir)/Rules.mk
endif
--else ifeq ($(FOUND_OS),solaris)
+- ifeq ($(FOUND_OS),bsd)
+- ifeq ($(FOUND_X11),yes)
+- ADDLIBS += ${X_LIBS}
+- include $(tray_dir)/Rules.mk
+- include $(linflash_dir)/Rules.mk
+- endif
+- else
+- ifeq ($(FOUND_OS),solaris)
+- include $(capture_dir)/Rules.mk
+- include $(capture_dir)/libng/Rules.mk
+- include $(capture_dir)/libng/plugins/Rules.mk
+endif
+ifeq ($(FOUND_OS),solaris)
- include $(capture_dir)/Rules.mk
- include $(capture_dir)/libng/Rules.mk
- include $(capture_dir)/libng/plugins/Rules.mk
-@@ -269,6 +279,13 @@ else ifeq ($(FOUND_OS),solaris)
- ADDLIBS += ${X_LIBS}
- include $(tray_dir)/Rules.mk
- include $(linflash_dir)/Rules.mk
-+ endif
-+endif
-+
-+ifeq ($(FOUND_OS),bsd)
++ include $(capture_dir)/Rules.mk
++ include $(capture_dir)/libng/Rules.mk
++ include $(capture_dir)/libng/plugins/Rules.mk
+
+- ifeq ($(FOUND_X11),yes)
+- ADDLIBS += ${X_LIBS}
+- include $(tray_dir)/Rules.mk
+- include $(linflash_dir)/Rules.mk
+- endif
+- endif
+- endif
+ ifeq ($(FOUND_X11),yes)
-+ ADDLIBS += ${X_LIBS}
-+ include $(tray_dir)/Rules.mk
- endif
++ ADDLIBS += ${X_LIBS}
++ include $(tray_dir)/Rules.mk
++ include $(linflash_dir)/Rules.mk
++ endif
endif
+ #########################################################
diff -urN /usr/ports/net/amsn/patches/patch-amsn net/amsn/patches/patch-amsn
--- /usr/ports/net/amsn/patches/patch-amsn Sat Feb 2 22:17:50 2008
+++ net/amsn/patches/patch-amsn Thu Jul 3 22:57:02 2008
@@ -1,11 +1,20 @@
$OpenBSD: patch-amsn,v 1.2 2008/02/02 21:17:50 steven Exp $
---- amsn.orig Sat Feb 2 22:12:58 2008
-+++ amsn Sat Feb 2 22:13:16 2008
+--- amsn.orig Thu Jun 26 22:51:24 2008
++++ amsn Thu Jul 3 20:59:41 2008
@@ -1,6 +1,6 @@
#!/bin/sh
# \
-exec wish $0 $@
-+exec __LOCALBASE__/bin/wish8.4 $0 $@
++exec __LOCALBASE__/bin/wish__TCL_VERSION__ $0 $@
###
###
+@@ -168,7 +168,7 @@ if { [OnDarwin] } {
+ }
+ lprepend auto_path [file join utils]
+
+-set libtls ""
++set libtls "__LOCALBASE__/lib/tls1.5.0"
+
+ catch { source [file join $HOME tlsconfig.tcl] }
+
diff -urN /usr/ports/net/amsn/patches/patch-amsn-remote net/amsn/patches/patch-amsn-remote
--- /usr/ports/net/amsn/patches/patch-amsn-remote Mon Oct 22 21:32:24 2007
+++ net/amsn/patches/patch-amsn-remote Thu Jul 3 19:52:52 2008
@@ -3,7 +3,7 @@
+++ amsn-remote Fri Dec 1 14:49:00 2006
@@ -1,4 +1,4 @@
-#!/usr/bin/wish
-+#!__LOCALBASE__/bin/wish8.4
++#!__LOCALBASE__/bin/wish__TCL_VERSION__
###
### Remote controller program
###
diff -urN /usr/ports/net/amsn/patches/patch-amsn-remote-CLI net/amsn/patches/patch-amsn-remote-CLI
--- /usr/ports/net/amsn/patches/patch-amsn-remote-CLI Mon Oct 22 21:32:24 2007
+++ net/amsn/patches/patch-amsn-remote-CLI Thu Jul 3 19:53:31 2008
@@ -3,7 +3,7 @@
+++ amsn-remote-CLI Fri Dec 1 16:21:25 2006
@@ -1,4 +1,4 @@
-#!/usr/bin/tclsh
-+#!__LOCALBASE__/bin/wish8.4
++#!__LOCALBASE__/bin/wish__TCL_VERSION__
###
### Remote controller program
###
diff -urN /usr/ports/net/amsn/patches/patch-amsn.orig net/amsn/patches/patch-amsn.orig
--- /usr/ports/net/amsn/patches/patch-amsn.orig Thu Jan 1 01:00:00 1970
+++ net/amsn/patches/patch-amsn.orig Thu Jul 3 19:53:00 2008
@@ -0,0 +1,11 @@
+$OpenBSD: patch-amsn,v 1.2 2008/02/02 21:17:50 steven Exp $
+--- amsn.orig Sat Feb 2 22:12:58 2008
++++ amsn Sat Feb 2 22:13:16 2008
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # \
+-exec wish $0 $@
++exec __LOCALBASE__/bin/wish__TCL_VERSION__ $0 $@
+
+ ###
+ ###
diff -urN /usr/ports/net/amsn/patches/patch-configure net/amsn/patches/patch-configure
--- /usr/ports/net/amsn/patches/patch-configure Sat Feb 2 22:17:50 2008
+++ net/amsn/patches/patch-configure Thu Jul 3 20:59:46 2008
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2008/02/02 21:17:50 steven Exp $
---- configure.orig Mon Dec 24 22:35:51 2007
-+++ configure Sat Feb 2 20:13:16 2008
-@@ -1781,8 +1781,8 @@ case `uname -s` in
+--- configure.orig Thu Jun 26 22:56:42 2008
++++ configure Thu Jul 3 20:58:59 2008
+@@ -1883,8 +1883,8 @@ case `uname -s` in
OpenBSD | FreeBSD | NetBSD)
# *BSD has important stuff (from ports)
# in /usr/local ...
@@ -12,7 +12,7 @@
FOUND_OS="bsd"
;;
Darwin)
-@@ -1904,7 +1904,7 @@ echo X"$prefix" |
+@@ -2008,7 +2008,7 @@ $as_echo X"$prefix" |
fi
@@ -21,7 +21,7 @@
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
# Check whether --enable-version-check was given.
if test "${enable_version_check+set}" = set; then
-@@ -3279,7 +3279,7 @@ echo $ECHO_N "checking tcl build dir... $ECHO_C" >&6;
+@@ -3407,7 +3407,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
/usr/lib64/tcl8.5.* \
/usr/local/lib64/tcl8.5 \
/usr/local/lib64/tcl8.5.* \
@@ -30,7 +30,7 @@
for i in $dirs ; do
-@@ -3427,7 +3427,7 @@ echo $ECHO_N "checking tk build dir... $ECHO_C" >&6; }
+@@ -3556,7 +3556,7 @@ $as_echo_n "checking tk build dir... " >&6; }
/usr/lib64/tk8.5.* \
/usr/local/lib64/tk8.5 \
/usr/local/lib64/tk8.5.* \
diff -urN /usr/ports/net/amsn/pkg/PLIST net/amsn/pkg/PLIST
--- /usr/ports/net/amsn/pkg/PLIST Sat Feb 2 22:17:50 2008
+++ net/amsn/pkg/PLIST Thu Jul 3 20:30:34 2008
@@ -20,7 +20,6 @@
share/amsn/balloon.tcl
share/amsn/bugs.tcl
share/amsn/chatwindow.tcl
-share/amsn/clgui.tcl
share/amsn/config.tcl
share/amsn/console.tcl
share/amsn/contactlist.tcl
@@ -87,6 +86,7 @@
share/amsn/lang/langko
share/amsn/lang/langlt
share/amsn/lang/langmk
+share/amsn/lang/langmt
share/amsn/lang/langnl
share/amsn/lang/langno
share/amsn/lang/langoc
@@ -383,6 +383,7 @@
share/amsn/skins/default/pixmaps/moretabs.png
share/amsn/skins/default/pixmaps/msnbot.png
share/amsn/skins/default/pixmaps/mystatus_bg.png
+share/amsn/skins/default/pixmaps/newline.png
share/amsn/skins/default/pixmaps/no-emblem.png
share/amsn/skins/default/pixmaps/note.png
share/amsn/skins/default/pixmaps/notesdispic.png
diff -urN /usr/ports/security/tcltls/Makefile security/tcltls/Makefile
--- /usr/ports/security/tcltls/Makefile Sun Sep 16 01:30:01 2007
+++ security/tcltls/Makefile Thu Jul 3 23:04:20 2008
@@ -4,7 +4,7 @@
VERSION= 1.5.0
DISTNAME= tls${VERSION}-src
-PKGNAME= tcltls-${VERSION}
+PKGNAME= tcltls-${VERSION}p0
SHARED_LIBS= tls150 0.0
CATEGORIES= security lang/tcl
@@ -26,8 +26,9 @@
RUN_DEPENDS= :tcl-${TCL_VERSION}.*:lang/tcl/${TCL_VERSION}
BUILD_DEPENDS= ${RUN_DEPENDS}
-TCLTLS= tls1.5
-TCL_VERSION= 8.4
+TCLTLS= tls1.50
+TCLTLS_DIR= tls1.5
+TCL_VERSION= 8.5
SUBST_VARS+= TCLTLS
CONFIGURE_STYLE=gnu
@@ -38,7 +39,7 @@
MAKE_FLAGS= MYCFLAGS="${CFLAGS}"
-WRKDIST= ${WRKDIR}/${TCLTLS}
+WRKDIST= ${WRKDIR}/${TCLTLS_DIR}
REGRESS_TARGET= test
diff -urN /usr/ports/security/tcltls/patches/patch-pkgIndex_tcl_in security/tcltls/patches/patch-pkgIndex_tcl_in
--- /usr/ports/security/tcltls/patches/patch-pkgIndex_tcl_in Thu Jan 1 01:00:00 1970
+++ security/tcltls/patches/patch-pkgIndex_tcl_in Thu Jul 3 23:03:56 2008
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- pkgIndex.tcl.in.orig Thu Jul 3 23:03:40 2008
++++ pkgIndex.tcl.in Thu Jul 3 23:03:49 2008
+@@ -5,5 +5,5 @@
+ # replace the original which didn't include the commands from "tls.tcl".
+ #
+
+-package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @[EMAIL PROTECTED] ] ; [list source [file join $dir tls.tcl] ]"
++package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @[EMAIL PROTECTED] ] ; [list source [file join $dir tls.tcl] ]"
+
