upgrade to version 3.3

This commit is contained in:
kevlo 2003-06-06 06:06:18 +00:00
parent 3c171fec61
commit 4e88f77eec
7 changed files with 23 additions and 117 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2002/10/12 15:38:23 naddy Exp $
# $OpenBSD: Makefile,v 1.9 2003/06/06 06:06:18 kevlo Exp $
COMMENT= "generic playlist manager for UNIX"
DISTNAME= xhippo-3.2
DISTNAME= xhippo-3.3
CATEGORIES= audio
HOMEPAGE= http://www.gnu.org/software/xhippo/
@ -16,19 +16,19 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNU:=xhippo/}
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+
MAKE_FLAGS= CFLAGS="${CFLAGS}"
LIB_DEPENDS= gdk_pixbuf_xlib-2.0.0.0::x11/gtk+2 \
id3tag.1::audio/mad
USE_X11= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-gtk2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODULES= gettext
DOCS= ChangeLog gnu-xhippo.html screenshot.jpeg xhippo.html.gz \
xhippo.info.gz xhippo.ps.gz xhippo.sgml xhippo.txt.gz
xhippo.info.gz xhippo.ps.gz xhippo.sgml xhippo.txt.gz xhippo_toc.html
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xhippo
@ -36,6 +36,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/xhippo.config ${PREFIX}/share/examples/xhippo/xhippo.config-sample
${INSTALL_DATA} ${WRKSRC}/xhippo.gtkrc ${PREFIX}/share/examples/xhippo
cd ${WRKSRC}/doc; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/xhippo
${INSTALL_MAN} ${WRKSRC}/doc/xhippo.1 ${PREFIX}/man/man1
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (xhippo-3.2.tar.gz) = 8f8a0ae7006f162aebc19af3680970a8
RMD160 (xhippo-3.2.tar.gz) = 929548977e33b91722d5e9d4788e26e58997e1dd
SHA1 (xhippo-3.2.tar.gz) = 24a5468ff8cca2f92a3ce8ca8bd3d7592b2b191d
MD5 (xhippo-3.3.tar.gz) = 28ef26e3a0199daa9e5535a8b682bffe
RMD160 (xhippo-3.3.tar.gz) = 4023286bc843c15b1527fec49cda65a48a763af5
SHA1 (xhippo-3.3.tar.gz) = 15fb21a9027110f1f7b8e17dc33be6c28a67c601

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile.in,v 1.2 2002/10/12 15:38:23 naddy Exp $
--- Makefile.in.orig Mon Jul 23 21:16:01 2001
+++ Makefile.in Sat Oct 12 17:27:37 2002
@@ -98,7 +98,7 @@ SUBDIRS = intl po
# Enable this for debugging using gdb or similar
CFLAGS = -g -Wall -Wmissing-prototypes -Wstrict-prototypes
#CFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes
-CPPFLAGS = -DSYSTEMXHIPPOCONFIG=\"@sysconfdir@/xhippo.config\" -DVERSION=\"@VERSION@\" -DLOCALEDIR=\"@datadir@/locale\" @UIFLAGS@
+CPPFLAGS = -DSYSTEMXHIPPOCONFIG=\"@sysconfdir@/xhippo.config\" -DVERSION=\"@VERSION@\" -DLOCALEDIR=\"@datadir@/locale\" @UIFLAGS@ @CPPFLAGS@
# Kludge: intl needs config.h. We don't use config.h. We distribute an
# empty one.

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2002/10/12 15:38:23 naddy Exp $
--- aclocal.m4.orig Mon Jul 23 21:14:22 2001
+++ aclocal.m4 Sat Oct 12 17:28:50 2002
@@ -183,10 +183,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

View File

@ -1,14 +1,15 @@
$OpenBSD: patch-configure_in,v 1.1 2002/10/12 15:38:23 naddy Exp $
--- configure.in.orig Mon Jul 23 21:14:09 2001
+++ configure.in Sat Oct 12 17:34:56 2002
@@ -38,7 +38,9 @@ AC_CHECK_FUNCS(nftw, , AC_MSG_WARN(nftw
AM_PATH_GTK(1.0.0,,AC_MSG_ERROR(No GTK found. Set the path right or install it.))
AC_CHECK_PROG(foundgnome, gnome-config, yes, no)
$OpenBSD: patch-configure_in,v 1.2 2003/06/06 06:06:33 kevlo Exp $
--- configure.in.orig Mon Feb 3 00:24:30 2003
+++ configure.in Fri Jun 6 13:54:42 2003
@@ -55,8 +55,9 @@ fi
-AC_CHECK_LIB(id3, ID3Tag_New, ID3LIBS="-lid3 -lz"; AC_DEFINE(HAVE_LIBID3), ID3LIBS="", -lz)
ID3LIBS=""
ZLIB=""
-AC_CHECK_LIB(id3, ID3Tag_New, ID3LIBS="-lid3"; ZLIB="-lz"; AC_DEFINE(HAVE_LIBID3, 1, [Have libid3]), , -lz)
-AC_CHECK_LIB(id3tag, id3_file_tag, ID3LIBS="$ID3LIBS -lid3tag"; ZLIB="-lz"; AC_DEFINE(HAVE_LIBID3TAG, 1, [Have libid3tag]), , -lz)
+dnl C++ library
+dnl AC_CHECK_LIB(id3, ID3Tag_New, ID3LIBS="-lid3 -lz"; AC_DEFINE(HAVE_LIBID3), ID3LIBS="", -lz)
+ID3LIBS=
+dnl AC_CHECK_LIB(id3, ID3Tag_New, ID3LIBS="-lid3"; ZLIB="-lz"; AC_DEFINE(HAVE_LIBID3, 1, [Have libid3]), , -lz)
+AC_CHECK_LIB(id3tag, id3_file_tag, ID3LIBS="-lid3tag"; ZLIB="-lz"; AC_DEFINE(HAVE_LIBID3TAG, 1, [Have libid3tag]), , -lz)
ID3LIBS="$ID3LIBS $ZLIB"
AC_SUBST(ID3LIBS)
dnl This is *not* the right way to do this, but GNOME's native

View File

@ -1,67 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.2 2002/10/12 15:38:23 naddy Exp $
--- po/Makefile.in.in.orig Mon Apr 30 16:38:22 2001
+++ po/Makefile.in.in Sat Oct 12 17:31:54 2002
@@ -24,6 +24,8 @@ gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
+DESTDIR =
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -111,9 +113,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -123,7 +125,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,12 +155,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +173,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/08/11 16:08:57 kevlo Exp $
@comment $OpenBSD: PLIST,v 1.4 2003/06/06 06:06:38 kevlo Exp $
bin/xhippo
man/man1/xhippo.1
share/doc/xhippo/ChangeLog
@ -9,6 +9,7 @@ share/doc/xhippo/xhippo.info.gz
share/doc/xhippo/xhippo.ps.gz
share/doc/xhippo/xhippo.sgml
share/doc/xhippo/xhippo.txt.gz
share/doc/xhippo/xhippo_toc.html
share/examples/xhippo/xhippo.gtkrc
share/examples/xhippo/xhippo.config-sample
share/locale/de/LC_MESSAGES/xhippo.mo