diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | UPDATING | 12 | ||||
| -rw-r--r-- | multimedia/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/smplayer-qt4/Makefile | 16 | ||||
| -rw-r--r-- | multimedia/smplayer-qt4/pkg-descr | 7 | ||||
| -rw-r--r-- | multimedia/smplayer/Makefile | 39 | ||||
| -rw-r--r-- | multimedia/smplayer/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/smplayer/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | multimedia/smplayer/pkg-plist | 7 |
9 files changed, 46 insertions, 60 deletions
@@ -3476,3 +3476,4 @@ devel/swigruby||2008-05-11|Has expired: use devel/swig13 instead, last release w japanese/epson-ttfonts||2008-05-12|Removed because of extremely restrictive license x11-servers/xorg-printserver||2008-05-15|Has expired, software is obsolete www/mod_evasive20|www/mod_evasive|2008-05-17|No reason to have the 20 in the name, so remove it. +multimedia/smplayer-qt4||2008-05-17|Functionality is now included in smplayer. @@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20080517: + AFFECTS: users of multimedia/smplayer-* + AUTHOR: miwi@FreeBSD.org + + The slave port multimedia/smplayer-qt4 has been removed + with the upgrade of multimedia/smplayer to 0.6.0, qt3 is + no longer supported. They are now fully integrated into + multimedia/smplayer. + + Please uninstall multimedia/smplayer-qt4 port before + upgrading multimedia/smplayer to version 0.6.0 or higher. + 20080513: AFFECTS: users of secutity/amavisd-new AUTHOR: scheidell@secnap.net diff --git a/multimedia/Makefile b/multimedia/Makefile index b26ec4a37622..b018e17bd091 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -207,7 +207,6 @@ SUBDIR += smpeg SUBDIR += smpeg-xmms SUBDIR += smplayer - SUBDIR += smplayer-qt4 SUBDIR += smplayer-themes SUBDIR += spigot SUBDIR += streamanalyze diff --git a/multimedia/smplayer-qt4/Makefile b/multimedia/smplayer-qt4/Makefile deleted file mode 100644 index 5719197dd260..000000000000 --- a/multimedia/smplayer-qt4/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: smplayer-qt4 -# Date created: 16 Jun, 2007 -# Whom: Diego Depaoli <trebestie@gmail.com> and Yinghong Liu <relaxbsd@gmail.com> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -qt4 - -COMMENT= A complete front-end based on QT4 for mplayer - -CONFLICTS= smplayer-[0-9]* - -MASTERDIR= ${.CURDIR}/../../multimedia/smplayer - -.include "${MASTERDIR}/Makefile" diff --git a/multimedia/smplayer-qt4/pkg-descr b/multimedia/smplayer-qt4/pkg-descr deleted file mode 100644 index bffcd3e91427..000000000000 --- a/multimedia/smplayer-qt4/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -smplayer intents to be a complete front-end for mplayer,from -basic features like playing videos, dvds, vcdsto more advancing -features like support for mplayer filters,edl lists, and more. - -This port uses Qt4. - -WWW: http://smplayer.sourceforge.net/ diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile index db46b50bf97a..573639e43c5a 100644 --- a/multimedia/smplayer/Makefile +++ b/multimedia/smplayer/Makefile @@ -6,51 +6,38 @@ # PORTNAME= smplayer -DISTVERSION= 0.5.21 +DISTVERSION= 0.6.0 CATEGORIES= multimedia audio kde MASTER_SITES= SF +DISTNAME= ${PORTNAME}-${DISTVERSION}final MAINTAINER= miwi@FreeBSD.org -COMMENT?= A complete front-end based on QT3 for mplayer +COMMENT= A complete front-end based on QT4 for mplayer RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \ ${LOCALBASE}/share/smplayer/themes:${PORTSDIR}/multimedia/smplayer-themes -.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" USE_QT_VER= 4 -QT_COMPONENTS= qt3support corelib gui qmake_build moc_build uic_build uic3_build porting_build opengl - -ALL_TARGET= prep src/smplayer -.else -USE_QT_VER= 3 - -CONFLICTS?= smplayer-qt4-[0-9]* - -BUILD_DEPENDS+= qmake:${PORTSDIR}/devel/qmake - -QMAKE= ${QT_PREFIX}/bin/qmake - -MAKE_ENV+= QTDIR=${QT_PREFIX} \ - QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +QT_COMPONENTS= corelib gui qmake_build moc_build rcc_build uic_build \ + uic3_build porting_build opengl linguist ALL_TARGET= src/smplayer -.if defined(WITH_KDE) -USE_KDELIBS_VER=3 -MAKE_ARGS+= KDE_SUPPORT=1 -.endif -.endif - +USE_BZIP2= yes USE_GMAKE= yes INSTALLS_ICONS= yes -PORTDOCS= Changelog Configurable_shortcuts.txt Install.txt \ - Copying.txt Not_so_obvious_things.txt Translations.txt \ - Icon_themes.txt Readme.txt +MAN1= smplayer.1 +MANCOMPRESSED= yes + +PORTDOCS= Changelog Copying.txt Install.txt Not_so_obvious_things.txt \ + Readme.txt Release_notes.txt post-patch: @${REINPLACE_CMD} -e 's|qmake|${QMAKE}|g' \ + -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \ -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ + -e 's,/share/man,/man,g' \ ${WRKSRC}/Makefile post-install: diff --git a/multimedia/smplayer/distinfo b/multimedia/smplayer/distinfo index e737d6ba902b..bb9bc296f712 100644 --- a/multimedia/smplayer/distinfo +++ b/multimedia/smplayer/distinfo @@ -1,3 +1,3 @@ -MD5 (smplayer-0.5.21.tar.gz) = e68ecce456c20b0ff6a6bbae56d96e47 -SHA256 (smplayer-0.5.21.tar.gz) = ee2d7973c4b6c05f06bc59266469a94cf98bb3278d72fc6ada639ff271f15e25 -SIZE (smplayer-0.5.21.tar.gz) = 1026424 +MD5 (smplayer-0.6.0final.tar.bz2) = 056ef492305afdfc105874529204358f +SHA256 (smplayer-0.6.0final.tar.bz2) = 3111edfac2ad114d6db83f2242de3b69d4e6825ddba985370c615932723908fb +SIZE (smplayer-0.6.0final.tar.bz2) = 1016544 diff --git a/multimedia/smplayer/files/patch-Makefile b/multimedia/smplayer/files/patch-Makefile index 3255738ab6a2..815d165c3c7e 100644 --- a/multimedia/smplayer/files/patch-Makefile +++ b/multimedia/smplayer/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Jun 14 20:12:01 2007 -+++ Makefile Thu Jun 14 20:13:14 2007 +--- Makefile.orgi 2008-05-17 18:38:26.000000000 +0200 ++++ Makefile 2008-05-17 18:39:49.000000000 +0200 @@ -5,7 +5,6 @@ CONF_PREFIX=$(PREFIX) @@ -8,7 +8,7 @@ TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations CONF_PATH=$(CONF_PREFIX)/etc/smplayer THEMES_PATH=$(PREFIX)/share/smplayer/themes -@@ -22,7 +21,7 @@ +@@ -23,7 +22,7 @@ DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" CONF_PATH=\\\"$(CONF_PATH)\\\" \ TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \ @@ -17,16 +17,19 @@ SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\" -@@ -58,8 +57,6 @@ +@@ -61,11 +60,6 @@ install -m 644 src/input.conf $(DESTDIR)$(DATA_PATH) -install -d $(DESTDIR)$(TRANSLATION_PATH) install -m 644 src/translations/*.qm $(DESTDIR)$(TRANSLATION_PATH) - -install -d $(DESTDIR)$(DOC_PATH) - install -m 644 Changelog *.txt $(DESTDIR)$(DOC_PATH) +- +- -install -d $(DESTDIR)$(DOC_PATH) +- tar -C docs/ --exclude=.svn -c -f - . | tar -C $(DESTDIR)$(DOC_PATH) -x -f - -install -d $(DESTDIR)$(SHORTCUTS_PATH) cp src/shortcuts/* $(DESTDIR)$(SHORTCUTS_PATH) -@@ -79,8 +76,6 @@ +@@ -89,8 +83,6 @@ -rm $(PREFIX)/bin/smplayer -rm $(DATA_PATH)/input.conf -rm $(TRANSLATION_PATH)/*.qm @@ -35,9 +38,9 @@ -rm $(SHORTCUTS_PATH)/*.keys -rm $(KDE_ICONS)/64x64/apps/smplayer.png -rm $(KDE_ICONS)/32x32/apps/smplayer.png -@@ -88,5 +83,4 @@ - -rm $(KDE_ICONS)/16x16/apps/smplayer.png +@@ -99,5 +91,4 @@ -rm $(KDE_APPLNK)/smplayer.desktop + -rm $(PREFIX)/share/man/man1/smplayer.1.gz -rmdir $(TRANSLATION_PATH)/ - -rmdir $(DOC_PATH)/ -rmdir $(DATA_PATH)/ diff --git a/multimedia/smplayer/pkg-plist b/multimedia/smplayer/pkg-plist index e4eaecf669ee..48db69fecee2 100644 --- a/multimedia/smplayer/pkg-plist +++ b/multimedia/smplayer/pkg-plist @@ -1,22 +1,29 @@ bin/smplayer share/applications/smplayer.desktop +share/applications/smplayer_enqueue.desktop share/icons/hicolor/16x16/apps/smplayer.png share/icons/hicolor/22x22/apps/smplayer.png share/icons/hicolor/32x32/apps/smplayer.png share/icons/hicolor/64x64/apps/smplayer.png %%DATADIR%%/input.conf %%DATADIR%%/shortcuts/default.keys +%%DATADIR%%/translations/qt_fr.qm %%DATADIR%%/translations/smplayer_bg.qm %%DATADIR%%/translations/smplayer_cs.qm %%DATADIR%%/translations/smplayer_de.qm +%%DATADIR%%/translations/smplayer_el_GR.qm %%DATADIR%%/translations/smplayer_en_US.qm %%DATADIR%%/translations/smplayer_es.qm +%%DATADIR%%/translations/smplayer_eu.qm +%%DATADIR%%/translations/smplayer_fi.qm %%DATADIR%%/translations/smplayer_fr.qm %%DATADIR%%/translations/smplayer_hu.qm %%DATADIR%%/translations/smplayer_it.qm %%DATADIR%%/translations/smplayer_ja.qm %%DATADIR%%/translations/smplayer_ka.qm +%%DATADIR%%/translations/smplayer_ko.qm %%DATADIR%%/translations/smplayer_nl.qm +%%DATADIR%%/translations/smplayer_mk.qm %%DATADIR%%/translations/smplayer_pl.qm %%DATADIR%%/translations/smplayer_pt_BR.qm %%DATADIR%%/translations/smplayer_pt_PT.qm |