diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-06 04:47:51 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-06 04:47:51 +0000 |
commit | c2c863c426cbbd23170fff8edec0dd822683f70e (patch) | |
tree | e9e1e60d0914991dde95d41ed56abe39eeb87b43 /multimedia | |
parent | Chase libdvdread lib version bump on port version 0.9.4 (diff) |
Update 0.9.0
Notes
Notes:
svn path=/head/; revision=77016
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/ogle-gui/Makefile | 19 | ||||
-rw-r--r-- | multimedia/ogle-gui/distinfo | 2 | ||||
-rw-r--r-- | multimedia/ogle-gui/pkg-plist | 50 | ||||
-rw-r--r-- | multimedia/ogle/Makefile | 4 | ||||
-rw-r--r-- | multimedia/ogle/distinfo | 2 | ||||
-rw-r--r-- | multimedia/ogle/files/extra-patch-include:ogle_endian.h | 10 | ||||
-rw-r--r-- | multimedia/ogle/files/patch-include:ogle_endian.h | 19 | ||||
-rw-r--r-- | multimedia/ogle/pkg-plist | 7 |
8 files changed, 46 insertions, 67 deletions
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile index 23cda8ec1d89..faff3f0e5f86 100644 --- a/multimedia/ogle-gui/Makefile +++ b/multimedia/ogle-gui/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ogle -PORTVERSION= 0.8.5 +PORTVERSION= 0.9.0 CATEGORIES= multimedia gnome MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ PKGNAMESUFFIX= -gui @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_gui-${PORTVERSION} MAINTAINER= lioux@FreeBSD.org COMMENT= An add-on graphical user interface for Ogle -BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/multimedia/ogle +BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.9:${PORTSDIR}/multimedia/ogle LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ glade.4:${PORTSDIR}/devel/libglade \ xml2.5:${PORTSDIR}/textproc/libxml2 @@ -23,7 +23,10 @@ RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle USE_X_PREFIX= yes USE_GNOMENG= yes -USE_GNOME= gtk12 +USE_GNOME= gnomehack \ + gnomehier \ + gnomeprefix \ + gtk12 WANT_GNOME= yes USE_XPM= yes USE_REINPLACE= yes @@ -43,9 +46,6 @@ CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \ .if ${HAVE_GNOME:Mlibcapplet}!="" USE_GNOME+= libcapplet PKGNAMESUFFIX= -gnome -SHARE_DATADIR= share/gnome -.else -SHARE_DATADIR= share .endif PLIST_SUB= SHARE_DATADIR="${SHARE_DATADIR}" @@ -57,13 +57,8 @@ post-patch: ${CONFIGURE_WRKSRC}/configure # correct path for program data files @${REINPLACE_CMD} -E -e \ - 's!(LOCALEDIR[[:space:]]*=[^"]+\")[^/]+/!\1${PREFIX}/share/!; \ - s!(CONFIG_FILE[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!; \ + 's!(CONFIG_FILE[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!; \ s!(CONFIG_FILE_DTD[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!' \ ${WRKSRC}/src/Makefile.in -# install locale correctly - @${REINPLACE_CMD} -E -e \ - 's!(datadir[[:space:]]*=).*$$!\1${PREFIX}/share!' \ - ${WRKSRC}/po/Makefile.in.in .include <bsd.port.post.mk> diff --git a/multimedia/ogle-gui/distinfo b/multimedia/ogle-gui/distinfo index 12b916f9a3d1..72c72ec76a63 100644 --- a/multimedia/ogle-gui/distinfo +++ b/multimedia/ogle-gui/distinfo @@ -1 +1 @@ -MD5 (ogle_gui-0.8.5.tar.gz) = 92319326640a91a55b3219864710bb50 +MD5 (ogle_gui-0.9.0.tar.gz) = d8d25e0cc995706aa833e8fbbb5048f9 diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist index 1b54e8614d64..40aef4fc0f2c 100644 --- a/multimedia/ogle-gui/pkg-plist +++ b/multimedia/ogle-gui/pkg-plist @@ -1,33 +1,36 @@ lib/ogle/ogle_gui -%%SHARE_DATADIR%%/ogle_gui/angle.xpm -%%SHARE_DATADIR%%/ogle_gui/enter.xpm -%%SHARE_DATADIR%%/ogle_gui/fastforward.xpm -%%SHARE_DATADIR%%/ogle_gui/go_up.xpm -%%SHARE_DATADIR%%/ogle_gui/menus.xpm -%%SHARE_DATADIR%%/ogle_gui/ogle.xpm -%%SHARE_DATADIR%%/ogle_gui/ogle_gui.glade -%%SHARE_DATADIR%%/ogle_gui/rewind.xpm -%%SHARE_DATADIR%%/ogle_gui/skip_backwards.xpm -%%SHARE_DATADIR%%/ogle_gui/skip_forwards.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_down_arrow.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_first.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_last.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_left_arrow.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_pause.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_right_arrow.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_stop.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_timer.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_timer_stopped.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_up_arrow.xpm -%%SHARE_DATADIR%%/ogle_gui/stock_volume.xpm -%%SHARE_DATADIR%%/ogle_gui/subpicture.xpm +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/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 @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/sv 2>/dev/null || true +@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/pt 2>/dev/null || true @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/nl 2>/dev/null || true @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true @@ -37,6 +40,5 @@ share/locale/sv/LC_MESSAGES/ogle_gui.mo @unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/da 2>/dev/null || true @unexec rmdir %D/share/locale 2>/dev/null || true -@dirrm %%SHARE_DATADIR%%/ogle_gui -@unexec rmdir %D/%%SHARE_DATADIR%% 2>/dev/null || true +@dirrm share/gnome/ogle_gui @dirrm lib/ogle diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index f9b07af9f6ab..efea2242464e 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ogle -PORTVERSION= 0.8.5 +PORTVERSION= 0.9.0 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -14,7 +14,7 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Open DVD player that supports DVD menus LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ - dvdread.2:${PORTSDIR}/multimedia/libdvdread \ + dvdread.3:${PORTSDIR}/multimedia/libdvdread \ jpeg.9:${PORTSDIR}/graphics/jpeg \ mad.1:${PORTSDIR}/audio/mad \ xml2.5:${PORTSDIR}/textproc/libxml2 diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo index d62bb5a7def4..4d46cf3c98fd 100644 --- a/multimedia/ogle/distinfo +++ b/multimedia/ogle/distinfo @@ -1 +1 @@ -MD5 (ogle-0.8.5.tar.gz) = fcf34f2e2880bf5e66016b4107e814d5 +MD5 (ogle-0.9.0.tar.gz) = 84276fbe6a3ed2de5ce13589f19b7fc3 diff --git a/multimedia/ogle/files/extra-patch-include:ogle_endian.h b/multimedia/ogle/files/extra-patch-include:ogle_endian.h index 84e96d757188..228125b768c1 100644 --- a/multimedia/ogle/files/extra-patch-include:ogle_endian.h +++ b/multimedia/ogle/files/extra-patch-include:ogle_endian.h @@ -1,9 +1,9 @@ ---- include/ogle_endian.h.orig Thu Oct 4 00:41:49 2001 -+++ include/ogle_endian.h Sun Nov 10 17:12:23 2002 -@@ -39,6 +39,13 @@ - #elif defined(HAVE_SYS_ENDIAN_H) +--- include/ogle_endian.h.orig Wed Mar 5 23:26:06 2003 ++++ include/ogle_endian.h Wed Mar 5 23:28:37 2003 +@@ -45,6 +45,13 @@ + #elif defined(HAVE_SYS_ENDIAN_H) && defined(__FreeBSD__) && __FreeBSD_version >= 470000 # include <sys/endian.h> - # define FROM_BE_32(x) (swap32(x)) + # define FROM_BE_32(x) (be32toh(x)) +#elif defined(__FreeBSD__) +# define _KERNEL +# define I486_CPU /* Will crash unless 486+ */ diff --git a/multimedia/ogle/files/patch-include:ogle_endian.h b/multimedia/ogle/files/patch-include:ogle_endian.h deleted file mode 100644 index 69eccbe994b8..000000000000 --- a/multimedia/ogle/files/patch-include:ogle_endian.h +++ /dev/null @@ -1,19 +0,0 @@ ---- include/ogle_endian.h.orig Sun Nov 10 17:13:10 2002 -+++ include/ogle_endian.h Sun Nov 10 17:13:29 2002 -@@ -27,2 +27,6 @@ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #ifdef WORDS_BIGENDIAN -@@ -38,5 +42,8 @@ - # define FROM_BE_32(x) (bswap32(x)) --#elif defined(HAVE_SYS_ENDIAN_H) -+#elif defined(HAVE_SYS_ENDIAN_H) && !defined(__FreeBSD__) - # include <sys/endian.h> - # define FROM_BE_32(x) (swap32(x)) -+#elif defined(HAVE_SYS_ENDIAN_H) && defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+# include <sys/endian.h> -+# define FROM_BE_32(x) (be32toh(x)) - #else diff --git a/multimedia/ogle/pkg-plist b/multimedia/ogle/pkg-plist index 602b3998a6ce..b2c25371d1f2 100644 --- a/multimedia/ogle/pkg-plist +++ b/multimedia/ogle/pkg-plist @@ -1,19 +1,20 @@ bin/ifo_dump bin/ogle include/ogle/dvd.h +include/ogle/dvdbookmarks.h include/ogle/dvdcontrol.h include/ogle/dvdevents.h include/ogle/msgevents.h lib/ogle/libdvdcontrol.a lib/ogle/libdvdcontrol.la lib/ogle/libdvdcontrol.so -lib/ogle/libdvdcontrol.so.8 +lib/ogle/libdvdcontrol.so.9 lib/ogle/libmsgevents.a lib/ogle/libmsgevents.la lib/ogle/libmsgevents.so -lib/ogle/libmsgevents.so.5 -lib/ogle/ogle_audio +lib/ogle/libmsgevents.so.6 lib/ogle/ogle_ac3_p +lib/ogle/ogle_audio lib/ogle/ogle_cli lib/ogle/ogle_ctrl lib/ogle/ogle_mpeg_ps |