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

update to 0.97.2

Browse Source 
similar diff from bsdmaniak at gmail
This commit is contained in:
steven 2008-08-31 17:16:22 +00:00
parent 7ae8be4209
commit 13e2c4b2c2
8 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/amsn/Makefile
View File

@ -1,8 +1,8 @@
#$OpenBSD: Makefile,v 1.3 2008/02/02 21:17:49 steven Exp $
#$OpenBSD: Makefile,v 1.4 2008/08/31 17:16:22 steven Exp $
COMMENT= open source MSN Messenger clone
DISTNAME= amsn-0.97
DISTNAME= amsn-0.97.2
CATEGORIES= net
HOMEPAGE= http://www.amsn-project.net/
@ -20,26 +20,28 @@ WANTLIB= ICE SM X11 m z stdc++
LIB_DEPENDS= jpeg::graphics/jpeg \
png::graphics/png
RUN_DEPENDS= :tk-8.4.*:x11/tk/8.4 \
RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \
::security/tcltls \
::x11/bwidget \
:desktop-file-utils-*:devel/desktop-file-utils
BUILD_DEPENDS= :tk-8.4.*:x11/tk/8.4 \
BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} \
::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=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR}
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="${MODTK_INCDIR}/generic" \
TCLSH="${MODTCL_BIN}"
pre-configure:
perl -pi -e 's|__LOCALBASE__|${LOCALBASE}|' ${WRKSRC}/amsn*
@${SUBST_CMD} ${WRKSRC}/amsn*
post-install:
.for a in amsn amsn-remote amsn-remote-CLI

10
net/amsn/distinfo
View File

@ -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.2.tar.bz2) = bElNl7WrgQ8bJl7xm/ZSsA==
RMD160 (amsn-0.97.2.tar.bz2) = z8GVofNdJixxJl5kEt9mEQJ+zkU=
SHA1 (amsn-0.97.2.tar.bz2) = IkUrtZc8n7OOb+s6N7jWRTxWYA4=
SHA256 (amsn-0.97.2.tar.bz2) = ECa5mhEvhAwUswwWGJWsi2sbYTydlV7dsHxW1zi4uAs=
SIZE (amsn-0.97.2.tar.bz2) = 3431430

85
net/amsn/patches/patch-Makefile_in
View File

@ -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
$OpenBSD: patch-Makefile_in,v 1.3 2008/08/31 17:16:22 steven Exp $
--- Makefile.in.orig Thu May 29 00:46:00 2008
+++ Makefile.in Sun Aug 31 11:41:07 2008
@@ -11,10 +11,10 @@ STATIC := @STATIC@
doc_files := docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
@ -14,7 +14,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/02/02 21:17:50 steven Exp $
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 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/02/02 21:17:50 steven Exp $
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)
-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,48 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/02/02 21:17:50 steven Exp $
cp $(srcdir)/amsn.desktop $(DESTDIR)$(dstdir)/applications/
@@ -254,13 +262,15 @@ ifeq ($(FOUND_OS),linux)
@@ -271,22 +271,29 @@ ifeq ($(FOUND_OS),linux)
include $(tray_dir)/Rules.mk
include $(linflash_dir)/Rules.mk
endif
-else ifeq ($(FOUND_OS),bsd)
+endif
+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)
+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
-else
- ifeq ($(FOUND_OS),mac)
+endif
+
+ifeq ($(FOUND_OS),bsd)
+ ifeq ($(FOUND_X11),yes)
+ ADDLIBS += ${X_LIBS}
+ include $(tray_dir)/Rules.mk
endif
+ endif
+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)
+endif
+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)
+endif
+ifeq ($(FOUND_OS),solaris)
include $(capture_dir)/Rules.mk
include $(capture_dir)/libng/Rules.mk
include $(capture_dir)/libng/plugins/Rules.mk
@@ -296,8 +303,6 @@ else
include $(tray_dir)/Rules.mk
include $(linflash_dir)/Rules.mk
endif
- endif
- endif
endif
#########################################################

4
net/amsn/patches/patch-amsn
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-amsn,v 1.2 2008/02/02 21:17:50 steven Exp $
$OpenBSD: patch-amsn,v 1.3 2008/08/31 17:16:22 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/wish8.4 $0 $@
+exec ${MODTK_BIN} $0 $@
###
###

4
net/amsn/patches/patch-amsn-remote
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-amsn-remote,v 1.1.1.1 2007/10/22 19:32:24 steven Exp $
$OpenBSD: patch-amsn-remote,v 1.2 2008/08/31 17:16:22 steven Exp $
--- amsn-remote.orig Fri Dec 1 14:47:40 2006
+++ amsn-remote Fri Dec 1 14:49:00 2006
@@ -1,4 +1,4 @@
-#!/usr/bin/wish
+#!__LOCALBASE__/bin/wish8.4
+#!${MODTK_BIN}
###
### Remote controller program
###

4
net/amsn/patches/patch-amsn-remote-CLI
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-amsn-remote-CLI,v 1.1.1.1 2007/10/22 19:32:24 steven Exp $
$OpenBSD: patch-amsn-remote-CLI,v 1.2 2008/08/31 17:16:22 steven Exp $
--- amsn-remote-CLI.orig Fri Dec 1 16:20:48 2006
+++ amsn-remote-CLI Fri Dec 1 16:21:25 2006
@@ -1,4 +1,4 @@
-#!/usr/bin/tclsh
+#!__LOCALBASE__/bin/wish8.4
+#!${MODTK_BIN}
###
### Remote controller program
###

14
net/amsn/patches/patch-configure
View File

@ -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
$OpenBSD: patch-configure,v 1.3 2008/08/31 17:16:22 steven Exp $
--- configure.orig Fri Jul 25 16:47:03 2008
+++ configure Sun Aug 31 11:37:29 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 @@ $OpenBSD: patch-configure,v 1.2 2008/02/02 21:17:50 steven Exp $
FOUND_OS="bsd"
;;
Darwin)
@@ -1904,7 +1904,7 @@ echo X"$prefix" |
@@ -2008,7 +2008,7 @@ $as_echo X"$prefix" |
fi
@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.2 2008/02/02 21:17:50 steven Exp $
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 @@ $OpenBSD: patch-configure,v 1.2 2008/02/02 21:17:50 steven Exp $
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.* \

5
net/amsn/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2008/02/02 21:17:50 steven Exp $
@comment $OpenBSD: PLIST,v 1.4 2008/08/31 17:16:22 steven Exp $
%%SHARED%%
bin/amsn
bin/amsn-remote
@ -20,7 +20,6 @@ share/amsn/autoupdate.tcl
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/langit
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/mobile.png
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