Landry Breuil [Sun, Apr 22, 2007 at 10:19:25AM +0200] wrote:
> Same for me, works nice @i386. Hope to see it commited soon :)
>
Here's an update to easytag-2.1. Please test and comment.
Regards,
Bernd
Index: Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/easytag/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 12 Apr 2007 20:24:29 -0000 1.12
+++ Makefile 8 May 2007 11:42:40 -0000
@@ -2,9 +2,9 @@
COMMENT= "MP3 ID3 tags editor"
-DISTNAME= easytag-0.30
-PKGNAME= ${DISTNAME}p2
+DISTNAME= easytag-2.1
CATEGORIES= audio x11
+
HOMEPAGE= http://easytag.sourceforge.net/
# GPL
@@ -12,34 +12,35 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= glib gmodule ogg X11 Xau Xdmcp Xext Xi c m stdc++ z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easytag/}
EXTRACT_SUFX= .tar.bz2
-PATCHFILES= patch_easytag_030_030a.diff \
- patch_easytag_030a_030b.diff \
- patch_easytag_030b_030c.diff \
- patch_easytag_030c_030d.diff
-PATCH_DIST_STRIP= -p1
-
MODULES= devel/gettext
-LIB_DEPENDS= id3.>=3.8::audio/id3lib \
+
+WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
+ Xrender atk-1.0 c cairo expat fontconfig freetype \
+ glib-2.0 glitz gmodule-2.0 gobject-2.0 m ogg pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 png stdc++ z
+
+LIB_DEPENDS= id3.>=3::audio/id3lib \
FLAC.>=4::audio/flac \
vorbis.>=1,vorbisfile.>=1::audio/libvorbis \
- gdk.>=1.2,gtk.>=1.2::x11/gtk+
+ gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+
BUILD_DEPENDS= :help2man-*:devel/help2man
-USE_X11= Yes
-USE_GMAKE= Yes
USE_LIBTOOL= Yes
+USE_GMAKE= Yes
+USE_X11= Yes
+
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --disable-mp4 --disable-wavpack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/easytag
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/easytag
${INSTALL_DATA} ${WRKSRC}/USERS-GUIDE ${PREFIX}/share/doc/easytag
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/easytag/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 5 Apr 2007 15:37:41 -0000 1.6
+++ distinfo 8 May 2007 10:39:16 -0000
@@ -1,25 +1,5 @@
-MD5 (easytag-0.30.tar.bz2) = nw394hnAQiZ28hr8ScxEvw==
-MD5 (patch_easytag_030_030a.diff) = IQwOSa1SQYFCCkgbIUpZFw==
-MD5 (patch_easytag_030a_030b.diff) = 042U0xlHHIsFH3bfcd5m6Q==
-MD5 (patch_easytag_030b_030c.diff) = 9I4HBW69XUt7lg2PeHxPEg==
-MD5 (patch_easytag_030c_030d.diff) = 9iGbZqBzdDQp6Dha+LtWrA==
-RMD160 (easytag-0.30.tar.bz2) = NwFHN9kWMR2iJROWjCGNax/W5aA=
-RMD160 (patch_easytag_030_030a.diff) = JbUMDPGqmZL3aweb2s3McLKhAd0=
-RMD160 (patch_easytag_030a_030b.diff) = 8QeCVIqmPcP38sbjMU/vTvm51xE=
-RMD160 (patch_easytag_030b_030c.diff) = hwlBmi1N2PjkvubI43rY8T+CqKc=
-RMD160 (patch_easytag_030c_030d.diff) = 0M3GPqM0XayuKNHUat1Lb967DqQ=
-SHA1 (easytag-0.30.tar.bz2) = Lu57S7Bk/x+pQoWBbGQ7WunDRrM=
-SHA1 (patch_easytag_030_030a.diff) = rKvpOVbeFlyfPP9DMEqmPorSnEk=
-SHA1 (patch_easytag_030a_030b.diff) = 1Earg2TuhMKuBKZPOBT1Fk/nkL4=
-SHA1 (patch_easytag_030b_030c.diff) = O3lmH/u4XOjOFb0Gb4wQ/7xqrXo=
-SHA1 (patch_easytag_030c_030d.diff) = wSMb7CgMrRpT8j1gTuxeZsfWLEg=
-SHA256 (easytag-0.30.tar.bz2) = 5EgW3HYw6N83LnoNvTgwfWyUfafXAkHILtxBFx0SyCU=
-SHA256 (patch_easytag_030_030a.diff) =
FweIhVSPs6PYnWOmLwJ2ipx0v5RWQSlqYMmqAN8wICo=
-SHA256 (patch_easytag_030a_030b.diff) =
IJ+ISDOi3h4bqOVR6en28cCQGBjkPMFwZ4607CldpKQ=
-SHA256 (patch_easytag_030b_030c.diff) =
tT6FfO8k41pIpxJ6HnZwngg2CNUMpaXoMSd1QGnDvmU=
-SHA256 (patch_easytag_030c_030d.diff) =
p7I8XpEfgq12Hi0fFKYmx/FqjVN/nD/wqLHqdYLWuL8=
-SIZE (easytag-0.30.tar.bz2) = 1094337
-SIZE (patch_easytag_030_030a.diff) = 4382
-SIZE (patch_easytag_030a_030b.diff) = 9160
-SIZE (patch_easytag_030b_030c.diff) = 6036
-SIZE (patch_easytag_030c_030d.diff) = 4673
+MD5 (easytag-2.1.tar.bz2) = pYXLnkALpGDsGAGFbqXpDw==
+RMD160 (easytag-2.1.tar.bz2) = tVNFjIz/AI3QREEqlWdKomR4sus=
+SHA1 (easytag-2.1.tar.bz2) = baASWrDcx+fsq+SIFH7N8Odfbyo=
+SHA256 (easytag-2.1.tar.bz2) = iQN3HTN5XQ5lwu5ufwlwnCgMwa5YeMIKIB16Swb/V+U=
+SIZE (easytag-2.1.tar.bz2) = 2924032
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 8 Feb 2004 02:48:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2004/02/08 02:48:13 naddy Exp $
---- Makefile.in.orig 2003-09-07 16:36:29.000000000 +0700
-+++ Makefile.in 2004-02-07 01:38:48.000000000 +0700
-@@ -477,7 +477,7 @@ info: info-recursive
-
- info-am:
-
--install-data-am: install-gnome_menuDATA install-textDATA
-+install-data-am: install-gnome_menuDATA
-
- install-exec-am:
-
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 10 Feb 2004 23:39:24 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.5 2004/02/10 23:39:24 espie Exp $
---- configure.orig 2004-02-09 01:35:43.000000000 +0100
-+++ configure 2004-02-09 01:40:44.000000000 +0100
-@@ -5416,7 +5416,7 @@ else
- ;;
-
- openbsd*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
-@@ -7708,7 +7708,7 @@ if test "${ac_cv_lib_vorbis_vorbis_comme
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lvorbis $LIBS"
-+LIBS="-lvorbis -lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -7762,7 +7762,7 @@ if test $ac_cv_lib_vorbis_vorbis_comment
- #define HAVE_LIBVORBIS 1
- _ACEOF
-
-- LIBS="-lvorbis $LIBS"
-+ LIBS="-lvorbis -lm $LIBS"
-
- else
- enable_ogg=no
Index: patches/patch-ltmain_sh
===================================================================
RCS file: patches/patch-ltmain_sh
diff -N patches/patch-ltmain_sh
--- patches/patch-ltmain_sh 8 Feb 2004 02:48:14 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,72 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2004/02/08 02:48:14 naddy Exp $
---- ltmain.sh.orig 2003-07-13 04:34:01.000000000 +0700
-+++ ltmain.sh 2004-02-07 01:39:52.000000000 +0700
-@@ -1031,6 +1031,17 @@ compiler."
- # These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
- ;;
-+ *-*-openbsd*)
-+ # Do not include libc due to us having libc/libc_r.
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ esac
-+ elif test "$arg" = "-lc_r"; then
-+ case "$host" in
-+ *-*-openbsd*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+ ;;
- esac
- fi
- deplibs="$deplibs $arg"
-@@ -2408,6 +2419,9 @@ compiler."
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-openbsd*)
-+ # Do not include libc due to us having libc/libc_r.
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4412,40 +4426,6 @@ relink_command=\"$relink_command\""
- # Exit here if they wanted silent mode.
- test "$show" = ":" && exit 0
-
-- echo
"----------------------------------------------------------------------"
-- echo "Libraries have been installed in:"
-- for libdir in $libdirs; do
-- echo " $libdir"
-- done
-- echo
-- echo "If you ever happen to want to link against installed libraries"
-- echo "in a given directory, LIBDIR, you must either use libtool, and"
-- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-- echo "flag during linking and do at least one of the following:"
-- if test -n "$shlibpath_var"; then
-- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
-- echo " during execution"
-- fi
-- if test -n "$runpath_var"; then
-- echo " - add LIBDIR to the \`$runpath_var' environment variable"
-- echo " during linking"
-- fi
-- if test -n "$hardcode_libdir_flag_spec"; then
-- libdir=LIBDIR
-- eval flag=\"$hardcode_libdir_flag_spec\"
--
-- echo " - use the \`$flag' linker flag"
-- fi
-- if test -n "$admincmds"; then
-- echo " - have your system administrator run these commands:$admincmds"
-- fi
-- if test -f /etc/ld.so.conf; then
-- echo " - have your system administrator add LIBDIR to
\`/etc/ld.so.conf'"
-- fi
-- echo
-- echo "See any operating system documentation about shared libraries for"
-- echo "more information, such as the ld(1) and ld.so(8) manual pages."
-- echo
"----------------------------------------------------------------------"
- exit 0
- ;;
-
Index: patches/patch-pixmaps_Makefile_in
===================================================================
RCS file: patches/patch-pixmaps_Makefile_in
diff -N patches/patch-pixmaps_Makefile_in
--- patches/patch-pixmaps_Makefile_in 8 Feb 2004 02:48:14 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-pixmaps_Makefile_in,v 1.3 2004/02/08 02:48:14 naddy Exp $
---- pixmaps/Makefile.in.orig 2004-02-07 01:40:11.000000000 +0700
-+++ pixmaps/Makefile.in 2004-02-07 01:40:34.000000000 +0700
-@@ -160,7 +160,7 @@ BITMAPS = \
- yes.xpm
-
-
--pixmapdir = $(datadir)/$(PACKAGE)
-+pixmapdir = $(datadir)/pixmaps
- pixmap_DATA = EasyTAG_logo.xpm
-
- icondir = $(datadir)/pixmaps
Index: pkg/PLIST
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/easytag/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 5 Aug 2004 16:14:48 -0000 1.7
+++ pkg/PLIST 8 May 2007 10:35:57 -0000
@@ -1,15 +1,18 @@
@comment $OpenBSD: PLIST,v 1.7 2004/08/05 16:14:48 espie Exp $
bin/easytag
@man man/man1/easytag.1
+share/applications/
+share/applications/easytag.desktop
share/doc/easytag/
-share/doc/easytag/README
share/doc/easytag/USERS-GUIDE
-share/gnome/
-share/gnome/apps/
-share/gnome/apps/Multimedia/
-share/gnome/apps/Multimedia/easytag.desktop
+share/easytag/
+share/easytag/ChangeLog
+share/easytag/EasyTAG_logo.xpm
+share/locale/bg/LC_MESSAGES/easytag.mo
share/locale/cs/LC_MESSAGES/easytag.mo
+share/locale/da/LC_MESSAGES/easytag.mo
share/locale/de/LC_MESSAGES/easytag.mo
+share/locale/el/LC_MESSAGES/easytag.mo
share/locale/es/LC_MESSAGES/easytag.mo
share/locale/fr/LC_MESSAGES/easytag.mo
share/locale/hu/LC_MESSAGES/easytag.mo
@@ -17,10 +20,11 @@ share/locale/it/LC_MESSAGES/easytag.mo
share/locale/ja/LC_MESSAGES/easytag.mo
share/locale/nl/LC_MESSAGES/easytag.mo
share/locale/pl/LC_MESSAGES/easytag.mo
+share/locale/pt_BR/LC_MESSAGES/easytag.mo
share/locale/ro/LC_MESSAGES/easytag.mo
share/locale/ru/LC_MESSAGES/easytag.mo
share/locale/sv/LC_MESSAGES/easytag.mo
share/locale/uk/LC_MESSAGES/easytag.mo
+share/locale/zh_CN/LC_MESSAGES/easytag.mo
share/pixmaps/
share/pixmaps/EasyTAG.xpm
-share/pixmaps/EasyTAG_logo.xpm
