mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Code Issues Releases Activity

- Update to 0.98.1

Browse Source 
Approved by:	itetcu (mentor)
This commit is contained in:
Sylvio Cesar Teixeira 2010-01-19 22:01:43 +00:00
parent 0b273bfe00
commit a7b2852837
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=248170
8 changed files with 774 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
net-im/amsn/Makefile
View File

@ -6,42 +6,42 @@
#
PORTNAME= amsn
PORTVERSION= 0.97.2
PORTREVISION= 3
PORTVERSION= 0.98.1
CATEGORIES= net-im
MASTER_SITES= SF
MAINTAINER= sylvio@FreeBSD.org
COMMENT= Alvano\'s MSN Messenger
LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib
BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
gstfarsight-0.10.0:${PORTSDIR}/net-im/farsight2 \
jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
BUILD_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
${LOCALBASE}/lib/tls/tls.tcl:${PORTSDIR}/devel/tcltls \
dtplite:${PORTSDIR}/devel/tcllib
RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
snack>=2.2.10_4:${PORTSDIR}/audio/snack
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
${LOCALBASE}/lib/tls/tls.tcl:${PORTSDIR}/devel/tcltls \
dtplite:${PORTSDIR}/devel/tcllib
snack>=2.2.10_4:${PORTSDIR}/audio/snack
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_XORG= x11
USE_GETTEXT= yes
USE_TCL= 86
USE_TK= 86
WITH_TCL_THREADS= 86
WITH_TK_THREADS= 86
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \
--with-tk=${LOCALBASE}/lib/tk8.4
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
TK_INC_SPEC=${LOCALBASE}/include/tk8.4/generic
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-tk=${TK_LIBDIR}
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.endif
CONFIGURE_ENV+= CFLAGS+="-I${LOCALBASE}/include" \
LDFLAGS+="-L${LOCALBASE}/lib"
post-patch:
@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' | ${XARGS} ${REINPLACE_CMD} -e 's| ||'

6
net-im/amsn/distinfo
View File

@ -1,3 +1,3 @@
MD5 (amsn-0.97.2.tar.bz2) = 6c494d97b5ab810f1b265ef19bf652b0
SHA256 (amsn-0.97.2.tar.bz2) = 1026b99a112f840c14b30c161895ac8b6b1b613c9d955eddb07c56d738b8b80b
SIZE (amsn-0.97.2.tar.bz2) = 3431430
MD5 (amsn-0.98.1.tar.bz2) = 2ef1d32324d3f9d85795433414abd51b
SHA256 (amsn-0.98.1.tar.bz2) = 36ee0e276154c5d08b9a6da3a60e85a92b2f18eb831dc058ac33728eed0a76fd
SIZE (amsn-0.98.1.tar.bz2) = 9024043

40
net-im/amsn/files/patch-Makefile.in
View File

@ -1,27 +1,19 @@
--- Makefile.in.orig 2007-12-25 05:25:59.000000000 +0800
+++ Makefile.in 2008-02-23 11:15:00.000000000 +0800
@@ -134,6 +134,11 @@
FILES_TO_EXCLUDE += AppMain.tcl
endif
--- Makefile.in.orig 2009-10-06 15:51:12.000000000 -0300
+++ Makefile.in 2009-10-09 20:46:42.000000000 -0300
@@ -67,7 +67,7 @@
TCL_STUB_LIB_SPEC := @TCL_STUB_LIB_SPEC@
+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@
# Directories in which the Tk core can be found
-TK_INC_SPEC := @TK_INC_SPEC@
+TK_INC_SPEC := @TK_INC_SPEC@/generic
TK_STUB_LIB_SPEC := @TK_STUB_LIB_SPEC@
#########################################################
@@ -227,6 +232,12 @@
libstdc++.a :
ln -s `g++ -print-file-name=libstdc++.a`
# C Flags for X
@@ -118,6 +118,7 @@
CXXFLAGS += -DPACKAGE='"$(PACKAGE)"'
CXXFLAGS += -DVERSION='"$(VERSION)"'
CXXFLAGS += -DLIBDIR='"$(LIBDIR)"'
+CXXFLAGS += -I${LOCALBASE}/include
+ifeq ($(FOUND_OS),bsd)
+ ifeq ($(FOUND_X11),yes)
+ ADDLIBS += ${X_LIBS}
+ include $(tray_dir)/Rules.mk
+ endif
+endif
#########################################################
# include stuff
ifeq ($(STATIC),yes)
CXXFLAGS += -static-libgcc -L.

2
net-im/amsn/files/patch-amsn
View File

@ -4,7 +4,7 @@
#!/bin/sh
# \
-exec wish $0 $@
+exec wish8.4 $0 $@
+exec wish8.6-threads $0 $@
###
###

129
net-im/amsn/files/patch-configure
View File

@ -1,132 +1,15 @@
--- ./configure.orig 2008-07-25 15:47:03.000000000 +0100
+++ ./configure 2008-08-05 11:51:42.000000000 +0100
@@ -1850,7 +1850,7 @@
fi
-if test "$enable_debug" == "yes" ; then
+if test "$enable_debug" = "yes" ; then
DEBUG="yes"
else
DEBUG="no"
@@ -1865,7 +1865,7 @@
fi
-if test "$enable_static" == "yes" ; then
+if test "$enable_static" = "yes" ; then
STATIC="yes"
else
STATIC="no"
@@ -2008,7 +2008,7 @@
--- configure.orig 2009-09-30 01:12:39.000000000 -0300
+++ configure 2009-09-30 01:15:06.000000000 -0300
@@ -2380,7 +2380,7 @@
fi
-TCLSH=`which tclsh`
+TCLSH=`which tclsh8.4`
+TCLSH=`which tclsh8.6-threads`
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
# Check whether --enable-version-check was given.
if test "${enable_version_check+set}" = set; then
@@ -2020,7 +2020,7 @@
OLDV=`expr $VERSION \< 8.4`
-if test "x${version_ok}" == "xyes" -a $OLDV == 1; then
+if test "x${version_ok}" = "xyes" -a $OLDV = 1; then
{ { $as_echo "$as_me:$LINENO: error: Your current Tcl/Tk installation has a version number of $VERSION. The minimal version required for aMSN to run is Tcl/Tk 8.4" >&5
$as_echo "$as_me: error: Your current Tcl/Tk installation has a version number of $VERSION. The minimal version required for aMSN to run is Tcl/Tk 8.4" >&2;}
{ (exit 1); exit 1; }; }
@@ -2962,7 +2962,7 @@
CC_INSTALLED=`which $CC`
-if test "x${CC_INSTALLED}" == "x"; then
+if test "x${CC_INSTALLED}" = "x"; then
{ { $as_echo "$as_me:$LINENO: error: You need a C compiler (gcc) to compiler aMSN. Please install gcc and try again" >&5
$as_echo "$as_me: error: You need a C compiler (gcc) to compiler aMSN. Please install gcc and try again" >&2;}
{ (exit 1); exit 1; }; }
@@ -3346,7 +3346,7 @@
CXX_INSTALLED=`which $CXX`
-if test "x${CXX_INSTALLED}" == "x"; then
+if test "x${CXX_INSTALLED}" = "x"; then
{ { $as_echo "$as_me:$LINENO: error: You need a C++ compiler (g++) to compiler aMSN. Please install g++ and try again" >&5
$as_echo "$as_me: error: You need a C++ compiler (g++) to compiler aMSN. Please install g++ and try again" >&2;}
{ (exit 1); exit 1; }; }
@@ -3425,7 +3425,7 @@
if test "x${TCL_INC_DIR}" != "x" -o "x${TCL_INC_SPEC}" != "x" \
-o "x${TCL_INCLUDE_DIR}" != "x" -o "x${TCL_INCLUDE_SPEC}" != "x"; then
- if test "x${TCL_VERSION}" == "x${VERSION}" ; then
+ if test "x${TCL_VERSION}" = "x${VERSION}" ; then
TCL_LIB_DIR=`cd $i; pwd`
break;
fi
@@ -3482,15 +3482,15 @@
TCL_INC_DIR=$TCL_INCLUDE_SPEC
fi
- if test "x${TCL_INC_DIR}" == "x"; then
+ if test "x${TCL_INC_DIR}" = "x"; then
TCL_INC_DIR=$TCL_INCLUDE_DIR
fi
- if test "x${TCL_INC_DIR}" == "x" -a -f ${TCL_PREFIX}/include/tcl.h; then
+ if test "x${TCL_INC_DIR}" = "x" -a -f ${TCL_PREFIX}/include/tcl.h; then
TCL_INC_DIR=${TCL_PREFIX}/include
fi
- if test "x${TCL_INC_DIR}" == "x"; then
+ if test "x${TCL_INC_DIR}" = "x"; then
{ { $as_echo "$as_me:$LINENO: error: You dot not have a devel package of Tcl" >&5
$as_echo "$as_me: error: You dot not have a devel package of Tcl" >&2;}
{ (exit 1); exit 1; }; }
@@ -3504,7 +3504,7 @@
TCL_INC_SPEC=$TCL_INC_DIR
framework=`echo "${TCL_BASE}" | grep -- "-framework"`
- if test "x${framework}" == "x"; then
+ if test "x${framework}" = "x"; then
TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_BASE}"
fi
TCL_STUB_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_STUB_BASE}"
@@ -3575,7 +3575,7 @@
if test "x${TK_INC_DIR}" != "x" -o "x${TK_INC_SPEC}" != "x" \
-o "x${TK_INCLUDE_DIR}" != "x" -o "x${TK_INCLUDE_SPEC}" != "x"; then
- if test "x${TK_VERSION}" == "x${VERSION}"; then
+ if test "x${TK_VERSION}" = "x${VERSION}"; then
TK_LIB_DIR=`cd $i; pwd`
break;
fi
@@ -3619,19 +3619,19 @@
TK_INC_DIR=$TK_INC_SPEC
fi
- if test "x${TK_INCLUDE_SPEC}" != "x"; then
- TK_INC_DIR=$TK_INCLUDE_SPEC
- fi
+ #if test "x${TK_INCLUDE_SPEC}" != "x"; then
+ #TK_INC_DIR=$TK_INCLUDE_SPEC
+ #fi
- if test "x${TK_INC_DIR}" == "x"; then
+ if test "x${TK_INC_DIR}" = "x"; then
TK_INC_DIR=$TK_INCLUDE_DIR
fi
- if test "x${TK_INC_DIR}" == "x" -a -f ${TK_PREFIX}/include/tk.h; then
+ if test "x${TK_INC_DIR}" = "x" -a -f ${TK_PREFIX}/include/tk.h; then
TK_INC_DIR=${TK_PREFIX}/include
fi
- if test "x${TK_INC_DIR}" == "x"; then
+ if test "x${TK_INC_DIR}" = "x"; then
{ { $as_echo "$as_me:$LINENO: error: You dot not have a devel package of Tk" >&5
$as_echo "$as_me: error: You dot not have a devel package of Tk" >&2;}
{ (exit 1); exit 1; }; }
@@ -3748,7 +3748,7 @@
if test "${enable_version_check+set}" = set; then :
@@ -3752,7 +3752,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded

191
net-im/amsn/files/patch-utils-linux-traydock-libtray.c
View File

@ -1,191 +0,0 @@
--- utils/linux/traydock/libtray.c.orig 2008-12-24 11:30:51.000000000 +0100
+++ utils/linux/traydock/libtray.c 2008-12-24 11:32:00.000000000 +0100
@@ -128,70 +128,25 @@
//}
}
-static char
-*get_wm_name (void)
-{
- int screen = DefaultScreen(display);
- Atom type;
- int format;
- unsigned long bytes_returned, n_returned;
- unsigned char *buffer;
-
- Window root = RootWindow(display, screen);
- Window *child;
- Atom supwmcheck = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
- Atom wmname = XInternAtom(display, "_NET_WM_NAME", False);
-
- XGetWindowProperty(display, root, supwmcheck, 0, 8, False, AnyPropertyType, &type, &format, &n_returned,
- &bytes_returned, (unsigned char **)&child);
-
- if (n_returned != 1) return NULL;
-
- XGetWindowProperty(display, *child, wmname, 0, 128, False, AnyPropertyType, &type, &format, &n_returned,
- &bytes_returned, &buffer);
-
- if (n_returned == 0) return NULL;
-
- XFree(child);
- return (char *) buffer;
-}
-
/* Procedure that Docks the icon */
static void
DockIcon(ClientData clientData)
{
- Window root, parent, *children;
- unsigned int n, ret, atom;
+ Window parent;
+ unsigned int ret, atom;
TrayIcon *icon= clientData;
char* wm_name;
- Tk_MapWindow(icon->win);
-
- XQueryTree(display, Tk_WindowId(icon->win), &root, &parent, &children, &n);
- XFree(children);
+ Tk_MakeWindowExist(icon->win);
Tk_SetWindowBackgroundPixmap(icon->win, ParentRelative);
- XSetWindowBackgroundPixmap(display, parent, ParentRelative);
xembed_set_info(icon->win,XEMBED_MAPPED);
- Tk_UnmapWindow(icon->win);
-
- if ( (atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", True )) == None ) {
- wm_name = get_wm_name();
- if (wm_name != NULL && !strcmp(wm_name, "KWin")) {
- atom = XInternAtom(display, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False);
- ret = XChangeProperty(display, parent, atom,
- XA_WINDOW, 32, PropModeReplace, (unsigned char *)&parent, 1);
- Tk_MapWindow(icon->win);
- }
- XFree(wm_name);
- } else {
- send_message(display,systemtray, atom,
- SYSTEM_TRAY_REQUEST_DOCK,Tk_WindowId(icon->win),0,0);
- }
-
+ atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False );
+ send_message(display,systemtray, atom,
+ SYSTEM_TRAY_REQUEST_DOCK,Tk_WindowId(icon->win),0,0);
}
/* Draw the icon */
@@ -204,10 +159,32 @@
int widthImg, heightImg;
Window r;
char cmdBuffer[1024];
+ XSizeHints *hints = NULL;
+ long supplied = 0;
XGetGeometry(display, Tk_WindowId(icon->win), &r, &x, &y, &w, &h, &b, &d);
XClearWindow(display, Tk_WindowId(icon->win));
+ /*
+ * Here we get the window hints because in some cases the XGetGeometry
+ * function returns the wrong width/height. We only check that
+ * min_width <= width <= max_width and min_height <= height <= max_height
+ */
+ hints = XAllocSizeHints();
+ XGetWMNormalHints(display, Tk_WindowId(icon->win), hints, &supplied);
+ if( supplied & PMaxSize ) {
+ w = (hints->max_width < w) ? hints->max_width : w;
+ h = (hints->max_height < h) ? hints->max_height : h;
+ }
+ if( supplied & PMinSize ) {
+ w = (hints->min_width > w) ? hints->min_width : w;
+ h = (hints->min_height > h) ? hints->min_height : h;
+ }
+ if(hints) {
+ XFree(hints);
+ hints = NULL;
+ }
+
if (((icon->width != w) || (icon->height != h) || (icon->mustUpdate)) && (icon->cmdCallback[0] != '\0')) {
snprintf(cmdBuffer,sizeof(cmdBuffer),"%s %u %u",icon->cmdCallback,w,h);
Tcl_EvalEx(globalinterp,cmdBuffer,-1,TCL_EVAL_GLOBAL);
@@ -222,6 +199,8 @@
if (heightImg > h)
heightImg = h;
+ if( !Tk_IsMapped(icon->win) )
+ Tk_MapWindow(icon->win);
Tk_RedrawImage(icon->pixmap, 0, 0, widthImg, heightImg, Tk_WindowId(icon->win), (w-widthImg)/2 , (h-heightImg)/2 );
}
@@ -328,6 +307,12 @@
XSizeHints *hint;
char cmdBuffer[1024];
+ /* systemtray was not available in Init */
+ if (systemtray==0) {
+ Tcl_AppendResult (interp, "cannot create a tray icon without a system tray", (char *) NULL);
+ return TCL_ERROR;
+ }
+
/* Get memory for trayicon data and zero it*/
icon = (TrayIcon *) malloc(sizeof(TrayIcon));
memset((void *) icon, 0, (sizeof(TrayIcon)));
@@ -335,18 +320,11 @@
mainw=Tk_MainWindow(interp);
- /* systemtray was not available in Init */
- if (systemtray==0) {
- Tcl_AppendResult (interp, "cannot create a tray icon without a system tray", (char *) NULL);
- return TCL_ERROR;
- }
-
/* Get the first argument string (object name) and check it */
arg=Tcl_GetStringFromObj(objv[1],(int *) &length);
//printf("Arg: %s\n",arg);
- if (strncmp(arg,".",1)) {
- Tcl_AppendResult (interp, "bad path name: ",
- Tcl_GetStringFromObj(objv[1],(int *) &length) , (char *) NULL);
+ if (arg == NULL || length < 1 || strncmp(arg, ".", 1)) {
+ Tcl_AppendResult (interp, "bad path name: ", arg , (char *) NULL);
return TCL_ERROR;
}
@@ -391,7 +369,7 @@
n++;
strcpy (icon->tooltip,Tcl_GetStringFromObj(objv[n],(int *) &length));
} else if (!strncmp(arg,"-command",length)) {
- /* Copy tooltip string */
+ /* Copy command string */
n++;
strcpy (icon->cmdCallback,Tcl_GetStringFromObj(objv[n],(int *) &length));
} else {
@@ -408,10 +386,12 @@
if (pixmap != NULL) {
/* Create the window */
icon->win=Tk_CreateWindowFromPath(interp,mainw,
- Tcl_GetStringFromObj(objv[1],(int *) &length),"");
+ Tcl_GetStringFromObj(objv[1],(int *) &length),NULL);
DockIcon((ClientData)icon);
+ Tk_GeometryRequest( icon->win, 24, 24);
+
icon->pixmap=Tk_GetImage(interp,icon->win,pixmap,ImageChangedProc, (ClientData)icon);
/* Create callback function for event handling */
@@ -421,9 +401,11 @@
/* Set default icon size hint */
hint = XAllocSizeHints();
- hint->flags |=PMinSize;
+ hint->flags |=PMinSize|PMaxSize;
hint->min_width=24;
+ hint->max_width=64;
hint->min_height=24;
+ hint->max_height=64;
XSetWMNormalHints(display,Tk_WindowId(icon->win),hint);
XFree(hint);

817
net-im/amsn/pkg-plist
View File

File diff suppressed because it is too large Load Diff

6
net-im/amsn/scripts/post-configure
View File

@ -1,19 +1,19 @@
#! /bin/sh
## 'wish' is not recognized in FreeBSD
## we should use 'wish8.4' instead
## we should use 'wish8.6-threads' instead
## this script fixes the first line in amsn and alarm.tcl scripts
cd $WRKSRC
mv alarm.tcl alarm.tcl.orig
echo \#!$PREFIX/bin/wish8.4 > alarm.tcl
echo \#!$PREFIX/bin/wish8.6-threads > alarm.tcl
echo -n \#\#old: >> alarm.tcl
cat alarm.tcl.orig >> alarm.tcl
rm alarm.tcl.orig
mv amsn amsn.orig
echo \#!$PREFIX/bin/wish8.4 > amsn
echo \#!$PREFIX/bin/wish8.6-threads > amsn
echo -n \#\#old: >> amsn
cat amsn.orig >> amsn
rm amsn.orig