diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-05 00:22:49 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-05 00:22:49 +0000 |
commit | 4c7d679b5ed78ebe505f15c2eacc4de58987aafc (patch) | |
tree | b1263c5df665886d958277a1035039441390c766 /multimedia | |
parent | o Fix outstanding issue with KDE aRts: do not lockup when exitting (diff) |
Update to 0.7.3
Reviewed by: kde (members)
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=76889
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/kmplayer-kde4/Makefile | 15 | ||||
-rw-r--r-- | multimedia/kmplayer-kde4/distinfo | 2 | ||||
-rw-r--r-- | multimedia/kmplayer-kde4/files/patch-configure | 20 | ||||
-rw-r--r-- | multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop | 10 | ||||
-rw-r--r-- | multimedia/kmplayer-kde4/pkg-descr | 2 | ||||
-rw-r--r-- | multimedia/kmplayer-kde4/pkg-plist | 7 | ||||
-rw-r--r-- | multimedia/kmplayer/Makefile | 15 | ||||
-rw-r--r-- | multimedia/kmplayer/distinfo | 2 | ||||
-rw-r--r-- | multimedia/kmplayer/files/patch-configure | 20 | ||||
-rw-r--r-- | multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop | 10 | ||||
-rw-r--r-- | multimedia/kmplayer/pkg-descr | 2 | ||||
-rw-r--r-- | multimedia/kmplayer/pkg-plist | 7 |
12 files changed, 64 insertions, 48 deletions
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile index 80a3b8cba232..930a7e2f7790 100644 --- a/multimedia/kmplayer-kde4/Makefile +++ b/multimedia/kmplayer-kde4/Makefile @@ -6,8 +6,8 @@ # PORTNAME= kmplayer -PORTVERSION= 0.6.5a -CATEGORIES= multimedia audio +PORTVERSION= 0.7.3 +CATEGORIES= multimedia audio kde MASTER_SITES= http://www.xs4all.nl/%7Ejjvrieze/ MAINTAINER= will@FreeBSD.org @@ -19,9 +19,20 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/kmplayer USE_KDEBASE_VER=3 USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET= CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug +post-patch: +# remove optimizations + @${REINPLACE_CMD} -e \ + 's|-O2||' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} +# do not try to roll our own mimetypes + @${REINPLACE_CMD} -E -e \ + 's|^(SUBDIRS.*)mimetypes|\1|' \ + ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/multimedia/kmplayer-kde4/distinfo b/multimedia/kmplayer-kde4/distinfo index 67c1ba073f6e..3186f74ee40d 100644 --- a/multimedia/kmplayer-kde4/distinfo +++ b/multimedia/kmplayer-kde4/distinfo @@ -1 +1 @@ -MD5 (kmplayer-0.6.5a.tar.bz2) = 0601f703d822f81ff17b3e96ebd22236 +MD5 (kmplayer-0.7.3.tar.bz2) = 5533bbbd2df768f4445ba72567cf178e diff --git a/multimedia/kmplayer-kde4/files/patch-configure b/multimedia/kmplayer-kde4/files/patch-configure deleted file mode 100644 index e21f6d696440..000000000000 --- a/multimedia/kmplayer-kde4/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure Sun Jan 26 11:03:18 2003 -+++ configure.new Fri Jan 31 02:29:08 2003 -@@ -2796,7 +2796,7 @@ - CFLAGS="-g -O2 $CFLAGS" - fi - else -- CFLAGS="-O2 -mcpu=pentium4 $CFLAGS" -+ CFLAGS="$CFLAGS" - fi - fi - -@@ -3328,7 +3328,7 @@ - if test "$CXX" = "KCC"; then - CXXFLAGS="+K3 $CXXFLAGS" - else -- CXXFLAGS="-O2 -mcpu=pentium4 $CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS" - fi - fi - fi diff --git a/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop new file mode 100644 index 000000000000..682e105c9f45 --- /dev/null +++ b/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop @@ -0,0 +1,10 @@ +--- kmplayer/kmplayer.desktop.orig Mon Mar 3 09:33:01 2003 ++++ kmplayer/kmplayer.desktop Mon Mar 3 09:40:25 2003 +@@ -10,6 +10,6 @@ + Terminal=0 + Name=KMPlayer + Name[nl]=KMultiMediaSpeler +-MimeType=audio/x-mp3;audio/x-vorbis;application/x-mplayer2;application/x-ogg;audio/x-mp2;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/quicktime;video/x-flic; ++MimeType=audio/x-mp3;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;application/vnd.ms-asf;video/x-msvideo;video/quicktime;video/x-flic; + Terminal=0 + InitialPreference=7 diff --git a/multimedia/kmplayer-kde4/pkg-descr b/multimedia/kmplayer-kde4/pkg-descr index c4469eb1a385..e47d8ab1fdfe 100644 --- a/multimedia/kmplayer-kde4/pkg-descr +++ b/multimedia/kmplayer-kde4/pkg-descr @@ -1,3 +1,5 @@ KDE frontend to mplayer +WWW: http://www.xs4all.nl/~jjvrieze/ + -- will@freebsd.org diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist index 13c84f17f517..e1de9e26f147 100644 --- a/multimedia/kmplayer-kde4/pkg-plist +++ b/multimedia/kmplayer-kde4/pkg-plist @@ -7,10 +7,15 @@ share/applnk/Multimedia/More/kmplayer.desktop share/applnk/Multimedia/kmplayer.desktop share/apps/kmplayer/kmplayerpartui.rc share/apps/kmplayer/kmplayerui.rc +share/config/kmplayerrc share/doc/HTML/en/kmplayer/common share/doc/HTML/en/kmplayer/index.cache.bz2 share/doc/HTML/en/kmplayer/index.docbook -share/config/kmplayerrc +share/icons/locolor/16x16/apps/kmplayer.png +share/icons/locolor/32x32/apps/kmplayer.png +share/locale/hu/LC_MESSAGES/kmplayer.mo share/services/kmplayer_component.desktop +@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/hu 2>/dev/null || true @dirrm share/doc/HTML/en/kmplayer @dirrm share/apps/kmplayer diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index 80a3b8cba232..930a7e2f7790 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -6,8 +6,8 @@ # PORTNAME= kmplayer -PORTVERSION= 0.6.5a -CATEGORIES= multimedia audio +PORTVERSION= 0.7.3 +CATEGORIES= multimedia audio kde MASTER_SITES= http://www.xs4all.nl/%7Ejjvrieze/ MAINTAINER= will@FreeBSD.org @@ -19,9 +19,20 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/kmplayer USE_KDEBASE_VER=3 USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET= CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug +post-patch: +# remove optimizations + @${REINPLACE_CMD} -e \ + 's|-O2||' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} +# do not try to roll our own mimetypes + @${REINPLACE_CMD} -E -e \ + 's|^(SUBDIRS.*)mimetypes|\1|' \ + ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo index 67c1ba073f6e..3186f74ee40d 100644 --- a/multimedia/kmplayer/distinfo +++ b/multimedia/kmplayer/distinfo @@ -1 +1 @@ -MD5 (kmplayer-0.6.5a.tar.bz2) = 0601f703d822f81ff17b3e96ebd22236 +MD5 (kmplayer-0.7.3.tar.bz2) = 5533bbbd2df768f4445ba72567cf178e diff --git a/multimedia/kmplayer/files/patch-configure b/multimedia/kmplayer/files/patch-configure deleted file mode 100644 index e21f6d696440..000000000000 --- a/multimedia/kmplayer/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure Sun Jan 26 11:03:18 2003 -+++ configure.new Fri Jan 31 02:29:08 2003 -@@ -2796,7 +2796,7 @@ - CFLAGS="-g -O2 $CFLAGS" - fi - else -- CFLAGS="-O2 -mcpu=pentium4 $CFLAGS" -+ CFLAGS="$CFLAGS" - fi - fi - -@@ -3328,7 +3328,7 @@ - if test "$CXX" = "KCC"; then - CXXFLAGS="+K3 $CXXFLAGS" - else -- CXXFLAGS="-O2 -mcpu=pentium4 $CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS" - fi - fi - fi diff --git a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop new file mode 100644 index 000000000000..682e105c9f45 --- /dev/null +++ b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop @@ -0,0 +1,10 @@ +--- kmplayer/kmplayer.desktop.orig Mon Mar 3 09:33:01 2003 ++++ kmplayer/kmplayer.desktop Mon Mar 3 09:40:25 2003 +@@ -10,6 +10,6 @@ + Terminal=0 + Name=KMPlayer + Name[nl]=KMultiMediaSpeler +-MimeType=audio/x-mp3;audio/x-vorbis;application/x-mplayer2;application/x-ogg;audio/x-mp2;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/quicktime;video/x-flic; ++MimeType=audio/x-mp3;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;application/vnd.ms-asf;video/x-msvideo;video/quicktime;video/x-flic; + Terminal=0 + InitialPreference=7 diff --git a/multimedia/kmplayer/pkg-descr b/multimedia/kmplayer/pkg-descr index c4469eb1a385..e47d8ab1fdfe 100644 --- a/multimedia/kmplayer/pkg-descr +++ b/multimedia/kmplayer/pkg-descr @@ -1,3 +1,5 @@ KDE frontend to mplayer +WWW: http://www.xs4all.nl/~jjvrieze/ + -- will@freebsd.org diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist index 13c84f17f517..e1de9e26f147 100644 --- a/multimedia/kmplayer/pkg-plist +++ b/multimedia/kmplayer/pkg-plist @@ -7,10 +7,15 @@ share/applnk/Multimedia/More/kmplayer.desktop share/applnk/Multimedia/kmplayer.desktop share/apps/kmplayer/kmplayerpartui.rc share/apps/kmplayer/kmplayerui.rc +share/config/kmplayerrc share/doc/HTML/en/kmplayer/common share/doc/HTML/en/kmplayer/index.cache.bz2 share/doc/HTML/en/kmplayer/index.docbook -share/config/kmplayerrc +share/icons/locolor/16x16/apps/kmplayer.png +share/icons/locolor/32x32/apps/kmplayer.png +share/locale/hu/LC_MESSAGES/kmplayer.mo share/services/kmplayer_component.desktop +@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/hu 2>/dev/null || true @dirrm share/doc/HTML/en/kmplayer @dirrm share/apps/kmplayer |