-USE_X_PREFIX -> USE_XLIB.

-X11BASE -> LOCALBASE, gtk lives in LOCALBASE.
-Bump the PORTREVISION.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6861 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 171 insertions, 0 deletions

diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
new file mode 100644
index 000000000..ae588423d
--- /dev/null
+++ b/multimedia/ogle-gui/Makefile
@@ -0,0 +1,63 @@
+# New ports collection makefile for:	ogle
+# Date created:				Tue Oct 16 18:35:39 BRST 2001
+# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ogle
+PORTVERSION=	0.9.2
+PORTREVISION=	6
+CATEGORIES=	multimedia gnome
+MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
+
+MAINTAINER=	lioux@FreeBSD.org
+COMMENT=	An add-on graphical user interface for Ogle
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
+LIB_DEPENDS=	glade-2.0:${PORTSDIR}/devel/libglade2 \
+		xml2.5:${PORTSDIR}/textproc/libxml2
+RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
+
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+USE_GNOME=	gnomehack \
+		gnomehier \
+		gnomeprefix \
+		gtk20
+WANT_GNOME=	yes
+USE_XPM=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
+		--with-dvdcontrol=${LOCALBASE} \
+		--without-included-gettext \
+		--enable-gtk2 \
+		--with-gtk-prefix=${LOCALBASE} \
+		--with-libiconv-prefix=${LOCALBASE} \
+		--with-libintl-prefix=${LOCALBASE} \
+		--with-xml-prefix=${LOCALBASE}
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
+.endif
+
+PLIST_SUB=	SHARE_DATADIR="${SHARE_DATADIR}"
+
+post-patch:
+# fix library version
+	@${REINPLACE_CMD} -E -e "s|(libglade\.so)\.0|\1.4|; \
+		s|%%LOCALBASE%%|${LOCALBASE}|" \
+			${CONFIGURE_WRKSRC}/configure
+# correct path for program data files
+	@${REINPLACE_CMD} -E -e \
+		's!(CONFIG_FILE[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!; \
+		s!(CONFIG_FILE_DTD[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!' \
+			${WRKSRC}/src/Makefile.in
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/ogle-gui/distinfo b/multimedia/ogle-gui/distinfo
new file mode 100644
index 000000000..4662f6794
--- /dev/null
+++ b/multimedia/ogle-gui/distinfo
@@ -0,0 +1,3 @@
+MD5 (ogle_gui-0.9.2.tar.gz) = e685aa3046f9da13532ede9300f2f794
+SHA256 (ogle_gui-0.9.2.tar.gz) = 9473ebc077d3aae97a53685212db49f6089215d72e76ecfc55b0e541e64c8bd7
+SIZE (ogle_gui-0.9.2.tar.gz) = 396673
diff --git a/multimedia/ogle-gui/files/patch-configure b/multimedia/ogle-gui/files/patch-configure
new file mode 100644
index 000000000..ee5bc6b30
--- /dev/null
+++ b/multimedia/ogle-gui/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Jun 10 17:42:29 2002
++++ configure	Mon Jun 10 17:42:43 2002
+@@ -1648,6 +1648,8 @@
+   ogle_pkglibdir=${exec_prefix}/lib/ogle
+ fi
+ 
++ogle_pkglibdir=%%LOCALBASE%%/lib/ogle
++
+ echo "$as_me:$LINENO: checking for ogle helper dir" >&5
+ echo $ECHO_N "checking for ogle helper dir... $ECHO_C" >&6
+ if test ! -x ${ogle_pkglibdir}/ogle_ctrl; then
diff --git a/multimedia/ogle-gui/files/patch-src::callbacks.c b/multimedia/ogle-gui/files/patch-src::callbacks.c
new file mode 100644
index 000000000..acabe3757
--- /dev/null
+++ b/multimedia/ogle-gui/files/patch-src::callbacks.c
@@ -0,0 +1,11 @@
+--- src/callbacks.c.orig	Sun Nov  9 18:20:31 2003
++++ src/callbacks.c	Sun Nov  9 18:21:14 2003
+@@ -22,7 +22,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <time.h>
++#include <sys/time.h>
+ #include <gtk/gtk.h>
+ #include <ogle/dvdcontrol.h>
+ 
diff --git a/multimedia/ogle-gui/files/patch-src::my_glade.c b/multimedia/ogle-gui/files/patch-src::my_glade.c
new file mode 100644
index 000000000..b4d23cd97
--- /dev/null
+++ b/multimedia/ogle-gui/files/patch-src::my_glade.c
@@ -0,0 +1,11 @@
+--- src/my_glade.c.orig	Sat May 10 23:43:23 2003
++++ src/my_glade.c	Sat May 10 23:45:47 2003
+@@ -39,7 +39,7 @@
+ 
+   fun = dlsym(handle, new_symbol);
+   error = dlerror();
+-  if(error != NULL) {
++  if(fun == NULL) {
+     fprintf(stderr, "Error during dlsym of %s: %s\n", new_symbol, error);
+     gtk_exit(1);
+   }
diff --git a/multimedia/ogle-gui/pkg-descr b/multimedia/ogle-gui/pkg-descr
new file mode 100644
index 000000000..cd282c548
--- /dev/null
+++ b/multimedia/ogle-gui/pkg-descr
@@ -0,0 +1,20 @@
+[ from developer's site ]
+
+This is a Graphical Interface for Ogle.
+Ogle is an open DVD player which:
+
+o Supports DVD menus and navigation
+o Reads from mounted, unmounted DVDs and hard drive
+o Reads encrypted and unencrypted DVDs using libdvdread/libdvdcss
+o A new MPEG2 decoder with mmx/altivec/medialib acceleration
+o Normal X11 and XFree86 Xvideo display support with subpicture
+  overlay
+o Accelerated display on Sun FFB2+ cards
+o Angle, audio and subpicture selection
+o Handles advanced subpicture commands such as fade/scroll and wipe
+o Detects and uses correct aspect for movie and menus
+o Possible to play AC3 via S/PDIF with an external command
+o Fullscreen mode
+o Screenshots with and without subpicture overlay
+
+WWW: http://www.dtek.chalmers.se/~dvd/
diff --git a/multimedia/ogle-gui/pkg-message b/multimedia/ogle-gui/pkg-message
new file mode 100644
index 000000000..edbec57ce
--- /dev/null
+++ b/multimedia/ogle-gui/pkg-message
@@ -0,0 +1,7 @@
+
+=============================================
+To use the graphical interface, just run Ogle
+It will detect the graphical interface
+Run 'ogle'
+=============================================
+
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
new file mode 100644
index 000000000..54127ed0e
--- /dev/null
+++ b/multimedia/ogle-gui/pkg-plist
@@ -0,0 +1,45 @@
+lib/ogle/ogle_gui
+share/gnome/ogle_gui/angle.xpm
+share/gnome/ogle_gui/enter.xpm
+share/gnome/ogle_gui/fastforward.xpm
+share/gnome/ogle_gui/go_up.xpm
+share/gnome/ogle_gui/menus.xpm
+share/gnome/ogle_gui/ogle.xpm
+share/gnome/ogle_gui/ogle_gui.glade
+share/gnome/ogle_gui/ogle_gui.glade2
+share/gnome/ogle_gui/rewind.xpm
+share/gnome/ogle_gui/skip_backwards.xpm
+share/gnome/ogle_gui/skip_forwards.xpm
+share/gnome/ogle_gui/stock_down_arrow.xpm
+share/gnome/ogle_gui/stock_first.xpm
+share/gnome/ogle_gui/stock_last.xpm
+share/gnome/ogle_gui/stock_left_arrow.xpm
+share/gnome/ogle_gui/stock_pause.xpm
+share/gnome/ogle_gui/stock_right_arrow.xpm
+share/gnome/ogle_gui/stock_stop.xpm
+share/gnome/ogle_gui/stock_timer.xpm
+share/gnome/ogle_gui/stock_timer_stopped.xpm
+share/gnome/ogle_gui/stock_up_arrow.xpm
+share/gnome/ogle_gui/stock_volume.xpm
+share/gnome/ogle_gui/subpicture.xpm
+share/locale/da/LC_MESSAGES/ogle_gui.mo
+share/locale/de/LC_MESSAGES/ogle_gui.mo
+share/locale/fr/LC_MESSAGES/ogle_gui.mo
+share/locale/nl/LC_MESSAGES/ogle_gui.mo
+share/locale/pt/LC_MESSAGES/ogle_gui.mo
+share/locale/sv/LC_MESSAGES/ogle_gui.mo
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale
+@dirrm share/gnome/ogle_gui
+@dirrm lib/ogle