From 4c514326022f288740747e40abba97b241f55359 Mon Sep 17 00:00:00 2001 From: Jim Mock Date: Mon, 11 Mar 2002 22:24:02 +0000 Subject: [PATCH] Update to version 0.17. PR: 35786 Submitted by: KATO Tsuguru --- audio/easytag-devel/Makefile | 17 +++++--- audio/easytag-devel/distinfo | 2 +- audio/easytag-devel/files/patch-Makefile | 39 ------------------- audio/easytag-devel/files/patch-ltmain.sh | 12 ++++++ audio/easytag-devel/files/patch-src::Makefile | 11 ------ audio/easytag-devel/pkg-plist | 1 + audio/easytag/Makefile | 17 +++++--- audio/easytag/distinfo | 2 +- audio/easytag/files/patch-Makefile | 39 ------------------- audio/easytag/files/patch-ltmain.sh | 12 ++++++ audio/easytag/files/patch-src::Makefile | 11 ------ audio/easytag/pkg-plist | 1 + 12 files changed, 50 insertions(+), 114 deletions(-) delete mode 100644 audio/easytag-devel/files/patch-Makefile create mode 100644 audio/easytag-devel/files/patch-ltmain.sh delete mode 100644 audio/easytag-devel/files/patch-src::Makefile delete mode 100644 audio/easytag/files/patch-Makefile create mode 100644 audio/easytag/files/patch-ltmain.sh delete mode 100644 audio/easytag/files/patch-src::Makefile diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile index 42375ca0ff99..7037e49d5f9f 100644 --- a/audio/easytag-devel/Makefile +++ b/audio/easytag-devel/Makefile @@ -7,21 +7,26 @@ # PORTNAME= easytag -PORTVERSION= 0.15 +PORTVERSION= 0.17 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ - id3:${PORTSDIR}/audio/id3lib +LIB_DEPENDS= id3-3.7.13:${PORTSDIR}/audio/id3lib \ + vorbis.1:${PORTSDIR}/audio/libvorbis USE_GTK= yes -USE_GMAKE= yes -MAKE_ENV= CFLAGS="${CFLAGS}" +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile + @${PERL} -pi -e 's|`gtk-config |`\$$GTK_CONFIG |g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ + 's|^gnome_menu|#gnome_menu|g ; \ + s|^icon|#icon|g' .include diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo index 1fcf44bf99f0..62b4981a80d2 100644 --- a/audio/easytag-devel/distinfo +++ b/audio/easytag-devel/distinfo @@ -1 +1 @@ -MD5 (easytag-0.15.tar.gz) = 39f1bd9a6054d742fba0bd877017f1e7 +MD5 (easytag-0.17.tar.gz) = 74726c0f6db4ea7cc110bc60547362ce diff --git a/audio/easytag-devel/files/patch-Makefile b/audio/easytag-devel/files/patch-Makefile deleted file mode 100644 index a36fc2f4b860..000000000000 --- a/audio/easytag-devel/files/patch-Makefile +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig Mon Apr 16 17:13:01 2001 -+++ Makefile Thu May 17 01:48:41 2001 -@@ -14,14 +14,12 @@ - - - # Installation prefix dirctory: --PREFIX = /usr - BINDIR = $(PREFIX)/bin - - --CC = gcc - GLIBS = `gtk-config --libs` - GFLAGS = `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR) --OPT = -g -Wall -O2 #-mpentium #-pedantic -+OPT = ${CFLAGS} - MAKE = make - LOCALEDIR = $(PREFIX)/share/locale - -@@ -33,14 +31,14 @@ - - - all: -- $(MAKE) -C src all -- [ -z "$(NLS)" ] || $(MAKE) -C po all -+ (cd src ; $(MAKE) all) -+ [ -z "$(NLS)" ] || (cd po ; $(MAKE) all) - - install: -- $(MAKE) install -C src -- [ -z "$(NLS)" ] || $(MAKE) install -C po -- cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/ -- cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm -+ (cd src ; $(MAKE) install) -+ [ -z "$(NLS)" ] || (cd po ; $(MAKE) install) -+# cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/ -+# cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm - mkdir -p $(PREFIX)/share/easytag - cp -f pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/ - @echo "------" diff --git a/audio/easytag-devel/files/patch-ltmain.sh b/audio/easytag-devel/files/patch-ltmain.sh new file mode 100644 index 000000000000..7b3e14b8b30f --- /dev/null +++ b/audio/easytag-devel/files/patch-ltmain.sh @@ -0,0 +1,12 @@ +--- ltmain.sh.orig Sun Mar 3 07:38:00 2002 ++++ ltmain.sh Fri Mar 8 01:58:58 2002 +@@ -2408,6 +2408,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then diff --git a/audio/easytag-devel/files/patch-src::Makefile b/audio/easytag-devel/files/patch-src::Makefile deleted file mode 100644 index bfd6a9bb462e..000000000000 --- a/audio/easytag-devel/files/patch-src::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig Thu May 17 01:52:53 2001 -+++ src/Makefile Thu May 17 01:51:43 2001 -@@ -23,7 +23,7 @@ - $(CC) $(GFLAGS) $(OPT) -c $< - - $(BINARY): $(OBJS) -- $(CC) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY) -+ $(CXX) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY) - - - diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist index dcc98faf209e..7ea4a59c915f 100644 --- a/audio/easytag-devel/pkg-plist +++ b/audio/easytag-devel/pkg-plist @@ -8,4 +8,5 @@ share/locale/ja/LC_MESSAGES/easytag.mo share/locale/nl/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 @dirrm share/easytag diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index 42375ca0ff99..7037e49d5f9f 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -7,21 +7,26 @@ # PORTNAME= easytag -PORTVERSION= 0.15 +PORTVERSION= 0.17 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ - id3:${PORTSDIR}/audio/id3lib +LIB_DEPENDS= id3-3.7.13:${PORTSDIR}/audio/id3lib \ + vorbis.1:${PORTSDIR}/audio/libvorbis USE_GTK= yes -USE_GMAKE= yes -MAKE_ENV= CFLAGS="${CFLAGS}" +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile + @${PERL} -pi -e 's|`gtk-config |`\$$GTK_CONFIG |g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ + 's|^gnome_menu|#gnome_menu|g ; \ + s|^icon|#icon|g' .include diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo index 1fcf44bf99f0..62b4981a80d2 100644 --- a/audio/easytag/distinfo +++ b/audio/easytag/distinfo @@ -1 +1 @@ -MD5 (easytag-0.15.tar.gz) = 39f1bd9a6054d742fba0bd877017f1e7 +MD5 (easytag-0.17.tar.gz) = 74726c0f6db4ea7cc110bc60547362ce diff --git a/audio/easytag/files/patch-Makefile b/audio/easytag/files/patch-Makefile deleted file mode 100644 index a36fc2f4b860..000000000000 --- a/audio/easytag/files/patch-Makefile +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig Mon Apr 16 17:13:01 2001 -+++ Makefile Thu May 17 01:48:41 2001 -@@ -14,14 +14,12 @@ - - - # Installation prefix dirctory: --PREFIX = /usr - BINDIR = $(PREFIX)/bin - - --CC = gcc - GLIBS = `gtk-config --libs` - GFLAGS = `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR) --OPT = -g -Wall -O2 #-mpentium #-pedantic -+OPT = ${CFLAGS} - MAKE = make - LOCALEDIR = $(PREFIX)/share/locale - -@@ -33,14 +31,14 @@ - - - all: -- $(MAKE) -C src all -- [ -z "$(NLS)" ] || $(MAKE) -C po all -+ (cd src ; $(MAKE) all) -+ [ -z "$(NLS)" ] || (cd po ; $(MAKE) all) - - install: -- $(MAKE) install -C src -- [ -z "$(NLS)" ] || $(MAKE) install -C po -- cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/ -- cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm -+ (cd src ; $(MAKE) install) -+ [ -z "$(NLS)" ] || (cd po ; $(MAKE) install) -+# cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/ -+# cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm - mkdir -p $(PREFIX)/share/easytag - cp -f pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/ - @echo "------" diff --git a/audio/easytag/files/patch-ltmain.sh b/audio/easytag/files/patch-ltmain.sh new file mode 100644 index 000000000000..7b3e14b8b30f --- /dev/null +++ b/audio/easytag/files/patch-ltmain.sh @@ -0,0 +1,12 @@ +--- ltmain.sh.orig Sun Mar 3 07:38:00 2002 ++++ ltmain.sh Fri Mar 8 01:58:58 2002 +@@ -2408,6 +2408,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then diff --git a/audio/easytag/files/patch-src::Makefile b/audio/easytag/files/patch-src::Makefile deleted file mode 100644 index bfd6a9bb462e..000000000000 --- a/audio/easytag/files/patch-src::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig Thu May 17 01:52:53 2001 -+++ src/Makefile Thu May 17 01:51:43 2001 -@@ -23,7 +23,7 @@ - $(CC) $(GFLAGS) $(OPT) -c $< - - $(BINARY): $(OBJS) -- $(CC) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY) -+ $(CXX) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY) - - - diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist index dcc98faf209e..7ea4a59c915f 100644 --- a/audio/easytag/pkg-plist +++ b/audio/easytag/pkg-plist @@ -8,4 +8,5 @@ share/locale/ja/LC_MESSAGES/easytag.mo share/locale/nl/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 @dirrm share/easytag