8 files changed, 57 insertions, 179 deletions

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 7bab7924e126..a70d6b8b0ca8 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.23
-PORTREVISION=	3
+PORTVERSION=	0.99.1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -49,9 +48,33 @@ CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src:xitk:common.h
 .endif
 
+# PRIi64 macro is not defined
+.if ${OSVERSION} < 500040
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src:xitk:common.h-1
+.endif
+
 # mbrtowc() is not implemented
 .if ${OSVERSION} < 500039
 CONFIGURE_ARGS+=	--disable-mbs
+# Xft support requires --enable-mbs configure option
+WITHOUT_XFT=	yes
+.endif
+
+.if ${OSVERSION} < 502000
+LIB_DEPENDS+=	readline.4:${PORTSDIR}/devel/readline
+CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
+.endif
+
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+.else
+CONFIGURE_ARGS+=	--disable-xft
+.endif
+
+.if exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA)
+PLIST_SUB+=	WITH_LIBCACA=""
+.else
+PLIST_SUB+=	WITH_LIBCACA="@comment "
 .endif
 
 post-patch:
diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo
index 8a051a11642a..df9031152c1f 100644
--- a/multimedia/xine/distinfo
+++ b/multimedia/xine/distinfo
@@ -1,2 +1,2 @@
-MD5 (xine-ui-0.9.23.tar.gz) = 526c96a7c08d2913e6f328e347fe615f
-SIZE (xine-ui-0.9.23.tar.gz) = 2798551
+MD5 (xine-ui-0.99.1.tar.gz) = 6309b312e41b0caaf53746715d0eb580
+SIZE (xine-ui-0.99.1.tar.gz) = 2339506
diff --git a/multimedia/xine/files/extra-patch-src:xitk:common.h-1 b/multimedia/xine/files/extra-patch-src:xitk:common.h-1
new file mode 100644
index 000000000000..1b56caf35979
--- /dev/null
+++ b/multimedia/xine/files/extra-patch-src:xitk:common.h-1
@@ -0,0 +1,15 @@
+--- src/xitk/common.h.orig	Fri Apr 16 04:20:51 2004
++++ src/xitk/common.h	Wed May 12 23:17:59 2004
+@@ -114,6 +114,12 @@
+ #define PLAYLIST_CONTROL_STOP   0x00000001 /* Don't start next entry in playlist */
+ #define PLAYLIST_CONTROL_IGNORE 0x00000002 /* Ignore some playlist adding action */
+ 
++#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
++#define PRIi64 "li"
++#else if defined(__i386__) || defined(__powerpc__)
++#define PRIi64 "lli"
++#endif                                                                         
++
+ #define SAFE_FREE(x)            do {           \
+                                   if((x)) {    \
+                                     free((x)); \
diff --git a/multimedia/xine/files/patch-ltmain.sh b/multimedia/xine/files/patch-ltmain.sh
index 5bfd9d1a8afc..0c8ab852b100 100644
--- a/multimedia/xine/files/patch-ltmain.sh
+++ b/multimedia/xine/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Sun May 18 00:48:49 2003
-+++ ltmain.sh	Sun May 18 12:21:57 2003
-@@ -973,6 +973,7 @@
+--- ltmain.sh.orig	Sat Apr 17 07:11:07 2004
++++ ltmain.sh	Mon May 10 00:27:21 2004
+@@ -1238,6 +1238,7 @@
  	;;
  
        -avoid-version)
@@ -8,16 +8,16 @@
  	avoid_version=yes
  	continue
  	;;
-@@ -1072,7 +1073,7 @@
+@@ -1341,7 +1342,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -4325,10 +4326,12 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -5493,10 +5494,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/multimedia/xine/files/patch-misc:Makefile.in b/multimedia/xine/files/patch-misc:Makefile.in
deleted file mode 100644
index 57f87905b11e..000000000000
--- a/multimedia/xine/files/patch-misc:Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/Makefile.in.orig	Wed Apr  7 23:51:25 2004
-+++ misc/Makefile.in	Wed Apr  7 23:51:58 2004
-@@ -244,7 +244,6 @@
- 	black.mpv
- 
- 
--bin_SCRIPTS = xine-check xine-bugreport
- subdir = misc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/xine/files/patch-readline:chardefs.h b/multimedia/xine/files/patch-readline:chardefs.h
deleted file mode 100644
index 36feec425280..000000000000
--- a/multimedia/xine/files/patch-readline:chardefs.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- readline/chardefs.h.orig	Sun May 19 23:29:25 2002
-+++ readline/chardefs.h	Sun May 19 23:29:37 2002
-@@ -32,9 +32,6 @@
- #    endif
- #    include <string.h>
- #  endif /* HAVE_STRING_H */
--#  if defined (HAVE_STRINGS_H)
--#    include <strings.h>
--#  endif /* HAVE_STRINGS_H */
- #else
- #  include <string.h>
- #endif /* !HAVE_CONFIG_H */
diff --git a/multimedia/xine/files/patch-src:xitk:download.c b/multimedia/xine/files/patch-src:xitk:download.c
deleted file mode 100644
index 7477eaa55e1e..000000000000
--- a/multimedia/xine/files/patch-src:xitk:download.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/xitk/download.c.orig	Sat Feb 21 13:38:19 2004
-+++ src/xitk/download.c	Sat Feb 21 13:39:43 2004
-@@ -39,6 +39,14 @@
- extern gGui_t   *gGui;
- 
- #ifdef HAVE_CURL
-+
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
- static int progress_callback(void *userdata, 
- 			     double dltotal, double dlnow, double ultotal, double ulnow) {
-   download_t  *download = (download_t *) userdata;
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index 5c39bc4285d8..62b8790c62d9 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -1,6 +1,9 @@
 bin/aaxine
+%%WITH_LIBCACA%%bin/cacaxine
 bin/fbxine
 bin/xine
+bin/xine-bugreport
+bin/xine-check
 bin/xine-remote
 share/doc/xine-ui/README.config_en
 share/doc/xine-ui/README.cs.0.Introduction
@@ -35,8 +38,8 @@ share/locale/fr/LC_MESSAGES/xine-ui.mo
 share/locale/fr/LC_MESSAGES/xitk.mo
 share/locale/it/LC_MESSAGES/xine-ui.mo
 share/locale/it/LC_MESSAGES/xitk.mo
-share/locale/pl_PL/LC_MESSAGES/xine-ui.mo
-share/locale/pl_PL/LC_MESSAGES/xitk.mo
+share/locale/pl/LC_MESSAGES/xine-ui.mo
+share/locale/pl/LC_MESSAGES/xitk.mo
 share/locale/pt_BR/LC_MESSAGES/xine-ui.mo
 share/locale/pt_BR/LC_MESSAGES/xitk.mo
 share/locale/sk/LC_MESSAGES/xine-ui.mo
@@ -51,128 +54,6 @@ share/pixmaps/xine_48x48.png
 share/xine/desktop/xine.desktop
 share/xine/skins/black.mpv
 share/xine/skins/xine_splash.png
-share/xine/skins/CelomaChrome/BigArrowDown.png
-share/xine/skins/CelomaChrome/BigArrowLeft.png
-share/xine/skins/CelomaChrome/BigArrowRight.png
-share/xine/skins/CelomaChrome/BigArrowUp.png
-share/xine/skins/CelomaChrome/CtlBg.png
-share/xine/skins/CelomaChrome/CtlBtn.png
-share/xine/skins/CelomaChrome/CtlDismiss.png
-share/xine/skins/CelomaChrome/CtlItemBtn.png
-share/xine/skins/CelomaChrome/FlitArrowDown.png
-share/xine/skins/CelomaChrome/FsBtn.png
-share/xine/skins/CelomaChrome/HideBtn.png
-share/xine/skins/CelomaChrome/LettersBlue.png
-share/xine/skins/CelomaChrome/LettersDigit.png
-share/xine/skins/CelomaChrome/LettersMiddle.png
-share/xine/skins/CelomaChrome/LettersMini.png
-share/xine/skins/CelomaChrome/MainAutoButton.png
-share/xine/skins/CelomaChrome/MainBg.png
-share/xine/skins/CelomaChrome/MainButton.png
-share/xine/skins/CelomaChrome/MainDummy.png
-share/xine/skins/CelomaChrome/MainEject.png
-share/xine/skins/CelomaChrome/MainFastB.png
-share/xine/skins/CelomaChrome/MainFastF.png
-share/xine/skins/CelomaChrome/MainMute.png
-share/xine/skins/CelomaChrome/MainNav.png
-share/xine/skins/CelomaChrome/MainNext.png
-share/xine/skins/CelomaChrome/MainPause.png
-share/xine/skins/CelomaChrome/MainPlay.png
-share/xine/skins/CelomaChrome/MainPower.png
-share/xine/skins/CelomaChrome/MainPrev.png
-share/xine/skins/CelomaChrome/MainStop.png
-share/xine/skins/CelomaChrome/MainVolumeBg.png
-share/xine/skins/CelomaChrome/MainVolumePad.png
-share/xine/skins/CelomaChrome/MrlBg.png
-share/xine/skins/CelomaChrome/MrlBtn.png
-share/xine/skins/CelomaChrome/MrlDismiss.png
-share/xine/skins/CelomaChrome/MrlSelect.png
-share/xine/skins/CelomaChrome/Onglet.png
-share/xine/skins/CelomaChrome/OngletSmall.png
-share/xine/skins/CelomaChrome/PlBg.png
-share/xine/skins/CelomaChrome/PlBtn.png
-share/xine/skins/CelomaChrome/PlDelete.png
-share/xine/skins/CelomaChrome/PlDeleteAll.png
-share/xine/skins/CelomaChrome/PlDismiss.png
-share/xine/skins/CelomaChrome/PlInputTxt.png
-share/xine/skins/CelomaChrome/PlItemBtn.png
-share/xine/skins/CelomaChrome/PlMoveDn.png
-share/xine/skins/CelomaChrome/PlMoveUp.png
-share/xine/skins/CelomaChrome/PlPlay.png
-share/xine/skins/CelomaChrome/PlSlidHBg.png
-share/xine/skins/CelomaChrome/PlSlidHPad.png
-share/xine/skins/CelomaChrome/SetupBtn.png
-share/xine/skins/CelomaChrome/SkItemBtn.png
-share/xine/skins/CelomaChrome/SkSlidBG.png
-share/xine/skins/CelomaChrome/SkSlidHBg.png
-share/xine/skins/CelomaChrome/SkSlidPad.png
-share/xine/skins/CelomaChrome/SliderHBg.png
-share/xine/skins/CelomaChrome/SliderHPad.png
-share/xine/skins/CelomaChrome/SliderVBg.png
-share/xine/skins/CelomaChrome/SliderVPad.png
-share/xine/skins/CelomaChrome/SnapBtn.png
-share/xine/skins/CelomaChrome/skinconfig
-share/xine/skins/cloudy/ComBox.png
-share/xine/skins/cloudy/ComDismiss.png
-share/xine/skins/cloudy/ComLetters.png
-share/xine/skins/cloudy/ComScrollArrowDown.png
-share/xine/skins/cloudy/ComScrollArrowLeft.png
-share/xine/skins/cloudy/ComScrollArrowRight.png
-share/xine/skins/cloudy/ComScrollArrowUp.png
-share/xine/skins/cloudy/ComScrollBg.png
-share/xine/skins/cloudy/ComScrollHBg.png
-share/xine/skins/cloudy/ComScrollHPad.png
-share/xine/skins/cloudy/ComScrollPad.png
-share/xine/skins/cloudy/CtlBg.png
-share/xine/skins/cloudy/CtlSkinItem.png
-share/xine/skins/cloudy/CtlSkinScrollBg.png
-share/xine/skins/cloudy/CtlSkinScrollHBg.png
-share/xine/skins/cloudy/CtlSliderBg.png
-share/xine/skins/cloudy/CtlSliderPad.png
-share/xine/skins/cloudy/MainAutoButton.png
-share/xine/skins/cloudy/MainBg.png
-share/xine/skins/cloudy/MainClose.png
-share/xine/skins/cloudy/MainCtlBtn.png
-share/xine/skins/cloudy/MainEject.png
-share/xine/skins/cloudy/MainFullScreen.png
-share/xine/skins/cloudy/MainMrlBtn.png
-share/xine/skins/cloudy/MainMute.png
-share/xine/skins/cloudy/MainNav.png
-share/xine/skins/cloudy/MainNext.png
-share/xine/skins/cloudy/MainPause.png
-share/xine/skins/cloudy/MainPlBtn.png
-share/xine/skins/cloudy/MainPlay.png
-share/xine/skins/cloudy/MainPlayFast.png
-share/xine/skins/cloudy/MainPlaySlow.png
-share/xine/skins/cloudy/MainPower.png
-share/xine/skins/cloudy/MainPrev.png
-share/xine/skins/cloudy/MainSetup.png
-share/xine/skins/cloudy/MainSliderBg.png
-share/xine/skins/cloudy/MainSliderPad.png
-share/xine/skins/cloudy/MainSmallArrowDown.png
-share/xine/skins/cloudy/MainSmallArrowUp.png
-share/xine/skins/cloudy/MainSnapshot.png
-share/xine/skins/cloudy/MainStop.png
-share/xine/skins/cloudy/MainVolumeBg.png
-share/xine/skins/cloudy/MainVolumePad.png
-share/xine/skins/cloudy/MrlBg.png
-share/xine/skins/cloudy/MrlItem.png
-share/xine/skins/cloudy/MrlPlay.png
-share/xine/skins/cloudy/MrlSelect.png
-share/xine/skins/cloudy/MrlSlidHBg.png
-share/xine/skins/cloudy/PlAdd.png
-share/xine/skins/cloudy/PlBg.png
-share/xine/skins/cloudy/PlDelete.png
-share/xine/skins/cloudy/PlDeleteAll.png
-share/xine/skins/cloudy/PlInputText.png
-share/xine/skins/cloudy/PlItem.png
-share/xine/skins/cloudy/PlMoveDown.png
-share/xine/skins/cloudy/PlMoveUp.png
-share/xine/skins/cloudy/PlPlay.png
-share/xine/skins/cloudy/fatsolid.pcf.gz
-share/xine/skins/cloudy/fonts.dir
-share/xine/skins/cloudy/skinconfig
-share/xine/skins/cloudy/smooth.pcf.gz
 share/xine/skins/xine-ui_logo.mpv
 share/xine/skins/xinetic/BigArrowDown.png
 share/xine/skins/xinetic/BigArrowLeft.png
@@ -263,8 +144,6 @@ share/xine/visuals/default.avi
 @unexec rmdir %D/share/locale/uk 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @dirrm share/xine/visuals
-@dirrm share/xine/skins/CelomaChrome
-@dirrm share/xine/skins/cloudy
 @dirrm share/xine/skins/xinetic
 @dirrm share/xine/desktop
 @dirrm share/xine/skins