aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--net-im/Makefile1
-rw-r--r--net-im/skype12/Makefile5
-rw-r--r--net-im/skype12/pkg-descr2
-rw-r--r--net/Makefile1
-rw-r--r--net/skype12/Makefile60
-rw-r--r--net/skype12/distinfo2
-rw-r--r--net/skype12/files/pkg-message.in10
-rw-r--r--net/skype12/pkg-descr5
-rw-r--r--net/skype12/pkg-plist38
10 files changed, 8 insertions, 117 deletions
diff --git a/MOVED b/MOVED
index 53a07bcf185d..b0d338154368 100644
--- a/MOVED
+++ b/MOVED
@@ -2175,3 +2175,4 @@ net/hs-network-bytestring||2011-05-08|Removed: It is deprecated by net/hs-networ
devel/hs-uvector||2011-05-08|Removed: It is deprecated by devel/hs-vector.
devel/hs-uvector-algorithms||2011-05-08|Removed: It is deprecated by devel/hs-vector-algorithms.
devel/jude-community|devel/astah-community|2011-05-09|Project was renamed
+net/skype12|net-im/skype12|2011-05-09|Moved to better category
diff --git a/net-im/Makefile b/net-im/Makefile
index 6e6534750433..e39c98de3ef6 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -159,6 +159,7 @@
SUBDIR += sendxmpp
SUBDIR += sim-im
SUBDIR += sim-im-devel
+ SUBDIR += skype12
SUBDIR += tapioca-qt
SUBDIR += telepathy-butterfly
SUBDIR += telepathy-farsight
diff --git a/net-im/skype12/Makefile b/net-im/skype12/Makefile
index 36d3a96fee6f..5407d592e4c5 100644
--- a/net-im/skype12/Makefile
+++ b/net-im/skype12/Makefile
@@ -7,13 +7,16 @@
PORTNAME= skype12
PORTVERSION= 1.2.0.18
-CATEGORIES= net
+CATEGORIES= net-im
MASTER_SITES= NETBSD
DISTNAME= skype_staticQT-${PORTVERSION}
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Legacy version P2P VoIP software
+DEPRECATED= very old version
+EXPIRATION_DATE= 2011-07-09
+
USE_BZIP2= yes
USE_LINUX= yes
USE_LINUX_APPS= expat fontconfig
diff --git a/net-im/skype12/pkg-descr b/net-im/skype12/pkg-descr
index 06e936789071..7f8483200e84 100644
--- a/net-im/skype12/pkg-descr
+++ b/net-im/skype12/pkg-descr
@@ -2,4 +2,6 @@ Skype is a free program that uses the latest P2P technology to bring
affordable and high-quality voice communications to people all over
the world.
+This is legacy version. For newer (recommanded) version see net-im/skype.
+
WWW: http://www.skype.com/
diff --git a/net/Makefile b/net/Makefile
index 1828ed15e22a..f5cee2476f51 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1012,7 +1012,6 @@
SUBDIR += skyfish
SUBDIR += skype
SUBDIR += skype-devel
- SUBDIR += skype12
SUBDIR += skystar2
SUBDIR += sl2tps
SUBDIR += slbd
diff --git a/net/skype12/Makefile b/net/skype12/Makefile
deleted file mode 100644
index 36d3a96fee6f..000000000000
--- a/net/skype12/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# New ports collection makefile for: skype12
-# Date created: Jun 21. 2004
-# Whom: netchild@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= skype12
-PORTVERSION= 1.2.0.18
-CATEGORIES= net
-MASTER_SITES= NETBSD
-DISTNAME= skype_staticQT-${PORTVERSION}
-
-MAINTAINER= itetcu@FreeBSD.org
-COMMENT= Legacy version P2P VoIP software
-
-USE_BZIP2= yes
-USE_LINUX= yes
-USE_LINUX_APPS= expat fontconfig
-PORTDOCS= LICENSE README
-SUB_FILES= pkg-message
-
-RESTRICTED= Redistribution prohibited.
-CONFLICTS= skype-1.[0-9].*
-
-OPTIONS= NVIDIA_GL "Enable Nvidia Support" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=dri
-.endif
-
-WRKSRC= ${WRKDIR}/skype-${PORTVERSION}
-
-post-patch:
- @${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype --resources=${PREFIX}/${SKYPEDIR}|' \
- ${WRKSRC}/skype.desktop
-
-do-build:
- ${BRANDELF} -t Linux ${WRKSRC}/skype
-
-do-install:
- @${INSTALL} -d ${PREFIX}/share/applications
- @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
- @${CHMOD} a+rx ${PREFIX}/bin/skype
- @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
- @${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
- @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sound lang" ${DATADIR}/
-
-.if !defined(NOPORTDOCS)
- @${INSTALL} -d ${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/skype12/distinfo b/net/skype12/distinfo
deleted file mode 100644
index 5fdf74a370f0..000000000000
--- a/net/skype12/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (skype_staticQT-1.2.0.18.tar.bz2) = fa825ff455b7c6fb53bd4090e7fb99038ce426b4078b4f1dda0307fc4fa216b3
-SIZE (skype_staticQT-1.2.0.18.tar.bz2) = 10678284
diff --git a/net/skype12/files/pkg-message.in b/net/skype12/files/pkg-message.in
deleted file mode 100644
index d98bfdf5bf92..000000000000
--- a/net/skype12/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-Skype has been installed in:
-
-%%PREFIX%%/bin/skype
-
-If you are starting from a terminal, please use the following command:
- skype --resources=%%DATADIR%%
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net/skype12/pkg-descr b/net/skype12/pkg-descr
deleted file mode 100644
index 06e936789071..000000000000
--- a/net/skype12/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Skype is a free program that uses the latest P2P technology to bring
-affordable and high-quality voice communications to people all over
-the world.
-
-WWW: http://www.skype.com/
diff --git a/net/skype12/pkg-plist b/net/skype12/pkg-plist
deleted file mode 100644
index c5fc6dd5f657..000000000000
--- a/net/skype12/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-bin/skype
-%%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_32_32.png
-%%DATADIR%%/icons/skype_48_32.png
-%%DATADIR%%/lang/skype_da.qm
-%%DATADIR%%/lang/skype_de.qm
-%%DATADIR%%/lang/skype_el.qm
-%%DATADIR%%/lang/skype_en.qm
-%%DATADIR%%/lang/skype_es.qm
-%%DATADIR%%/lang/skype_es_AR.qm
-%%DATADIR%%/lang/skype_et.qm
-%%DATADIR%%/lang/skype_fi.qm
-%%DATADIR%%/lang/skype_fr.qm
-%%DATADIR%%/lang/skype_it.qm
-%%DATADIR%%/lang/skype_iw.qm
-%%DATADIR%%/lang/skype_ja.qm
-%%DATADIR%%/lang/skype_ko.qm
-%%DATADIR%%/lang/skype_nl.qm
-%%DATADIR%%/lang/skype_no.qm
-%%DATADIR%%/lang/skype_pl.qm
-%%DATADIR%%/lang/skype_pt_BR.qm
-%%DATADIR%%/lang/skype_ro.qm
-%%DATADIR%%/lang/skype_ru.qm
-%%DATADIR%%/lang/skype_sv.qm
-%%DATADIR%%/lang/skype_zh_CN.qm
-%%DATADIR%%/lang/skype_zh_TW.qm
-%%DATADIR%%/sound/busy4.wav
-%%DATADIR%%/sound/call_in.wav
-%%DATADIR%%/sound/call_out.wav
-%%DATADIR%%/sound/hangup.wav
-%%DATADIR%%/sound/im.wav
-share/applications/skype.desktop
-share/pixmaps/skype.png
-@dirrm %%DATADIR%%/sound
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrmtry share/applications