On Mon, Jun 13, 2011 at 06:39:02PM +0200, Azwaw OUSADOU wrote:
> amsn contain a different version for bwidget. bwidget of ports cause some
> crashs.
Hmm, when I built amsn the whole bwidgets additions of your diff disappeared:
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/amsn/Makefile,v
retrieving revision 1.16
diff -p -u -r1.16 Makefile
--- Makefile 31 Mar 2011 16:41:30 -0000 1.16
+++ Makefile 21 Jun 2011 09:04:17 -0000
@@ -2,10 +2,9 @@
COMMENT= open source MSN Messenger clone
-V= 0.98.3
+V= 0.98.4
DISTNAME= amsn-$V-src
PKGNAME= ${DISTNAME:S/-src//}
-REVISION= 1
CATEGORIES= net
HOMEPAGE= http://www.amsn-project.net/
@@ -18,10 +17,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amsn/${V}/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=project/amsn/amsn/${V}/}
EXTRACT_SUFX= .tar.bz2
-
WANTLIB= ICE SM X11 m stdc++ z glib-2.0 gmodule-2.0 gobject-2.0 \
gthread-2.0 gstbase-0.10 gstinterfaces-0.10 \
gstreamer-0.10 xml2 jpeg png gstfarsight-0.10
@@ -31,7 +29,6 @@ LIB_DEPENDS= graphics/jpeg \
net/farsight2
RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \
security/tcltls \
- x11/bwidget \
devel/desktop-file-utils
BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} \
security/tcltls
@@ -43,13 +40,12 @@ MODULES= devel/gettext \
USE_GMAKE= Yes
MAKE_FLAGS= verbose=yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \
- --with-tk=${MODTK_LIBDIR} \
- --enable-debug \
- --disable-libv4l \
- --disable-upnp
+CONFIGURE_ARGS+=--disable-libv4l \
+ --disable-upnp \
+ --with-tcl="${MODTCL_LIBDIR}" \
+ --with-tk="${MODTK_LIBDIR}"
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
LDFLAGS="-lm -L${LOCALBASE}/lib" \
TK_INC_SPEC="${MODTK_INCDIR}/generic" \
TCLSH="${MODTCL_BIN}"
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/amsn/distinfo,v
retrieving revision 1.4
diff -p -u -r1.4 distinfo
--- distinfo 14 Sep 2010 12:34:42 -0000 1.4
+++ distinfo 21 Jun 2011 09:04:17 -0000
@@ -1,5 +1,5 @@
-MD5 (amsn-0.98.3-src.tar.bz2) = zxhPTHhmdqGgtLbhQRuRkw==
-RMD160 (amsn-0.98.3-src.tar.bz2) = IPcHBi2kpasetr7sSdAd/SupCpk=
-SHA1 (amsn-0.98.3-src.tar.bz2) = qoODoRzmY1Ks7uJ/nCkcFBCzQD0=
-SHA256 (amsn-0.98.3-src.tar.bz2) = Q7dtqdiG/Szc+KfiHJhyFBIooq0d76yorVN3IqMuDYg=
-SIZE (amsn-0.98.3-src.tar.bz2) = 13275477
+MD5 (amsn-0.98.4-src.tar.bz2) = lv0g6HCc7URDQy0SWl4KWg==
+RMD160 (amsn-0.98.4-src.tar.bz2) = jgw73ekCVA/nWbAZeER8xg2PvrM=
+SHA1 (amsn-0.98.4-src.tar.bz2) = 4AdhyUWtR+C3FcafH58Y9aS/KHw=
+SHA256 (amsn-0.98.4-src.tar.bz2) = eqEacZm0zaXoFEk90WCRWrTE+WwE3iwf58L+I+6rqHE=
+SIZE (amsn-0.98.4-src.tar.bz2) = 13513233
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/amsn/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -p -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 14 Sep 2010 12:34:42 -0000 1.4
+++ patches/patch-Makefile_in 21 Jun 2011 09:04:17 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.4 2010/09/14 12:34:42 jasper Exp $
---- Makefile.in.orig Mon Oct 19 20:52:33 2009
-+++ Makefile.in Sun Dec 27 22:50:18 2009
+--- Makefile.in.orig Thu Mar 18 20:58:48 2010
++++ Makefile.in Tue Jun 21 11:02:26 2011
@@ -11,10 +11,10 @@ STATIC := @STATIC@
doc_files := docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT
remote.help
@@ -13,8 +13,8 @@ $OpenBSD: patch-Makefile_in,v 1.4 2010/0
+FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/dpbrowser
FILES_TO_INSTALL += plugins utils/sexytile
FILES_TO_INSTALL += utils/log utils/uri utils/combobox utils/voipcontrols
-
-@@ -81,7 +81,7 @@ USE_MMX := @USE_MMX@
+ FILES_TO_INSTALL += utils/md4 utils/sasl ca-certs
+@@ -82,7 +82,7 @@ USE_MMX := @USE_MMX@
# build final cflags
CFLAGS := @CFLAGS@
ifeq (@DEBUG@,no)
@@ -23,7 +23,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2010/0
else
CFLAGS += -g3 -DDEBUG
endif
-@@ -103,9 +103,9 @@ CFLAGS += -DPACKAGE='"$(PACKAGE)"'
+@@ -104,9 +104,9 @@ CFLAGS += -DPACKAGE='"$(PACKAGE)"'
CFLAGS += -DVERSION='"$(VERSION)"'
CFLAGS += -DLIBDIR='"$(LIBDIR)"'
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2010/0
else
CXXFLAGS += -g3 -DDEBUG
endif
-@@ -233,9 +233,9 @@ install:: $(FILES_TO_INSTALL)
+@@ -234,9 +234,9 @@ install:: $(FILES_TO_INSTALL)
rm -Rf $(DESTDIR)$(dstdir)/$(PACKAGE)/$$p; \
done
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/amsn/patches/patch-configure,v
retrieving revision 1.4
diff -p -u -r1.4 patch-configure
--- patches/patch-configure 14 Sep 2010 12:34:42 -0000 1.4
+++ patches/patch-configure 21 Jun 2011 09:04:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2010/09/14 12:34:42 jasper Exp $
---- configure.orig Tue Oct 20 14:08:22 2009
-+++ configure Sun Dec 27 22:59:35 2009
-@@ -2258,8 +2258,8 @@ case `uname -s` in
+--- configure.orig Sun Dec 5 04:23:14 2010
++++ configure Tue Jun 21 11:02:27 2011
+@@ -2271,8 +2271,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.4 2010/09/
FOUND_OS="bsd"
;;
Darwin)
-@@ -2382,7 +2382,7 @@ $as_echo X"$prefix" |
+@@ -2395,7 +2395,7 @@ $as_echo X"$prefix" |
fi
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.4 2010/09/
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
# Check whether --enable-version-check was given.
if test "${enable_version_check+set}" = set; then :
-@@ -3059,17 +3059,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
+@@ -3095,17 +3095,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -39,7 +39,7 @@ $OpenBSD: patch-configure,v 1.4 2010/09/
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept
ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-@@ -3413,17 +3405,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
+@@ -3449,17 +3441,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@ -57,7 +57,7 @@ $OpenBSD: patch-configure,v 1.4 2010/09/
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3472,7 +3456,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
+@@ -3508,7 +3492,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
/usr/lib64 \
/usr/lib64/tcl8.* \
/usr/local/lib64/tcl8.* \
@@ -66,7 +66,7 @@ $OpenBSD: patch-configure,v 1.4 2010/09/
for i in $dirs ; do
-@@ -3597,9 +3581,8 @@ $as_echo_n "checking tk build dir... " >&6; }
+@@ -3633,9 +3617,8 @@ $as_echo_n "checking tk build dir... " >&6; }
/usr/lib64 \
/usr/lib64/tk8.* \
/usr/local/lib64/tk8.* \
@@ -77,7 +77,7 @@ $OpenBSD: patch-configure,v 1.4 2010/09/
for i in $dirs ; do
if test -f "$i"; then
-@@ -4974,13 +4957,13 @@ fi
+@@ -5008,13 +4991,13 @@ fi
done
@@ -94,7 +94,7 @@ $OpenBSD: patch-configure,v 1.4 2010/09/
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -5011,7 +4994,7 @@ fi
+@@ -5045,7 +5028,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/amsn/pkg/PLIST,v
retrieving revision 1.7
diff -p -u -r1.7 PLIST
--- pkg/PLIST 31 Mar 2011 16:41:30 -0000 1.7
+++ pkg/PLIST 21 Jun 2011 09:04:19 -0000
@@ -20,6 +20,18 @@ share/amsn/automsg.tcl
share/amsn/autoupdate.tcl
share/amsn/balloon.tcl
share/amsn/bugs.tcl
+share/amsn/ca-certs/
+share/amsn/ca-certs/37621ded.0
+share/amsn/ca-certs/6e7f22c1.0
+share/amsn/ca-certs/75ced341.0
+share/amsn/ca-certs/874806e2.0
+share/amsn/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/amsn/ca-certs/Microsoft_Internet_Authority.pem
+share/amsn/ca-certs/Microsoft_Secure_Server_Authority.pem
+share/amsn/ca-certs/README
+share/amsn/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
+share/amsn/ca-certs/VeriSign_International_Server_Class_3_CA.pem
+share/amsn/ca-certs/c692a373.0
share/amsn/chatwindow.tcl
share/amsn/config.tcl
share/amsn/console.tcl
@@ -62,8 +74,10 @@ share/amsn/lang.tcl
share/amsn/lang/LANG-HOWTO
share/amsn/lang/convert.tcl
share/amsn/lang/langal
+share/amsn/lang/langar
share/amsn/lang/langast
share/amsn/lang/langbg
+share/amsn/lang/langbs
share/amsn/lang/langca
share/amsn/lang/langca_VC
share/amsn/lang/langcs
@@ -103,6 +117,7 @@ share/amsn/lang/langsk
share/amsn/lang/langsl
share/amsn/lang/langsr
share/amsn/lang/langsv
+share/amsn/lang/langth
share/amsn/lang/langtr
share/amsn/lang/langvn
share/amsn/lang/langzh-CN
@@ -730,6 +745,9 @@ share/amsn/plugins/desktop_integration/p
share/amsn/plugins/devel/
share/amsn/plugins/devel/devel.tcl
share/amsn/plugins/devel/plugininfo.xml
+share/amsn/plugins/ebuddykiller/
+share/amsn/plugins/ebuddykiller/ebuddykiller.tcl
+share/amsn/plugins/ebuddykiller/plugininfo.xml
share/amsn/plugins/emotes/
share/amsn/plugins/emotes/emotes.tcl
share/amsn/plugins/emotes/plugininfo.xml
@@ -1531,7 +1549,6 @@ share/amsn/skins/Oxygen/pixmaps/box_up.p
share/amsn/skins/Oxygen/pixmaps/box_upleft.png
share/amsn/skins/Oxygen/pixmaps/box_upright.png
share/amsn/skins/Oxygen/pixmaps/busy.png
-share/amsn/skins/Oxygen/pixmaps/busy2.png
share/amsn/skins/Oxygen/pixmaps/busy_emblem.png
share/amsn/skins/Oxygen/pixmaps/busy_emblem_detailedview.png
share/amsn/skins/Oxygen/pixmaps/butblock.png
@@ -1884,7 +1901,6 @@ share/amsn/skins/Oxygen/smileys/Winking_
share/amsn/skins/Oxygen/smileys/XD.png
share/amsn/skins/Oxygen/smileys/Xbox.png
share/amsn/skins/Oxygen/smileys/YIM.png
-share/amsn/skins/Oxygen/smileys/angry.png
share/amsn/skins/Oxygen/smileys/im_xbox.gif
share/amsn/skins/Oxygen/smileys/null
share/amsn/skins/Oxygen/sounds/
> 2011/6/13 Jasper Lievisse Adriaanse <jas...@openbsd.org>
>
> > On Fri, Jun 10, 2011 at 07:05:54PM +0200, Azwaw OUSADOU wrote:
> > > Tested ok on amd64 and i386 !
> > >
> > > BSDManiak
> >
> > Why was the dependency on x11/bwidget removed?
> >
> > --
> > Cheers,
> > Jasper
> >
> > "Capable, generous men do not create victims, they nurture them."
> >
--
Cheers,
Jasper
"Capable, generous men do not create victims, they nurture them."
