cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Depend on devel/gettext rather than building the included one.

Browse Source 
- Properly install the message catalog files.
- Fix choice of ogg123 output devices.
- Miscellaneous cleaning.
ok rohee@
This commit is contained in:
naddy 2001-05-22 13:04:59 +00:00
parent 853cd0fdd7
commit 2137ae4583
7 changed files with 148 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/gqmpeg/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2001/04/18 20:32:12 rohee Exp $
# $OpenBSD: Makefile,v 1.21 2001/05/22 13:04:59 naddy Exp $
COMMENT= "mpg123 front-end with skin support"
@ -22,16 +22,18 @@ MASTER_SITE_SUBDIR= gqmpeg
BUILD_DEPENDS= mpg123::audio/mpg123
RUN_DEPENDS= mpg123::audio/mpg123
LIB_DEPENDS= gdk_pixbuf.2::graphics/gdk-pixbuf \
png.1::graphics/png
intl.1::devel/gettext
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LIBPNG="-lpng -lz"
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
DOCS= COPYING ChangeLog FAQ README SKIN-SPECS-V1 \
plugin/README.plugin
pre-install:
cd ${WRKSRC} && (${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqmpeg && \
${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqmpeg)
cd ${WRKSRC} && \
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqmpeg && \
${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqmpeg
.include <bsd.port.mk>

16
audio/gqmpeg/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/05/22 13:05:00 naddy Exp $
--- aclocal.m4.orig Mon Mar 19 19:23:22 2001
+++ aclocal.m4 Sun May 20 20:52:54 2001
@@ -568,10 +568,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

48
audio/gqmpeg/patches/patch-mixer.c
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-mixer.c,v 1.2 2001/03/27 20:48:25 rohee Exp $
Our mixer device is /dev/mixer not /dex/mixer0
*** src/mixer.c.orig Tue Mar 20 14:11:50 2001
--- src/mixer.c Tue Mar 20 14:14:08 2001
***************
*** 275,281 ****
--- 275,285 ----
mixer_device = getenv("MIXERDEVICE");
if (mixer_device == NULL)
+ #ifdef __OpenBSD__
+ mixer_device = "/dev/mixer";
+ #else
mixer_device = "/dev/mixer0";
+ #endif
if ((fd = open(mixer_device, O_RDWR)) == -1) {
perror(mixer_device);
***************
*** 352,358 ****
--- 356,366 ----
mixer_device = getenv("MIXERDEVICE");
if (mixer_device == NULL)
+ #ifdef __OpenBSD__
+ mixer_device = "/dev/mixer";
+ #else
mixer_device = "/dev/mixer0";
+ #endif
if ((fd = open(mixer_device, O_RDWR)) == -1) {
perror(mixer_device);
***************
*** 396,402 ****
--- 404,414 ----
mixer_device = getenv("MIXERDEVICE");
if (mixer_device == NULL)
+ #ifdef __OpenBSD__
+ mixer_device = "/dev/mixer";
+ #else
mixer_device = "/dev/mixer0";
+ #endif
if ((fd = open(mixer_device, O_RDWR)) == -1) {
perror(mixer_device);

58
audio/gqmpeg/patches/patch-po_Makefile_in_in Normal file
View File

@ -0,0 +1,58 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/05/22 13:05:01 naddy Exp $
--- po/Makefile.in.in.orig Sat Feb 17 04:46:32 2001
+++ po/Makefile.in.in Sun May 20 16:47:27 2001
@@ -111,9 +111,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 +123,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 +153,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 +171,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

21
audio/gqmpeg/patches/patch-src_io_ogg123_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_io_ogg123_c,v 1.1 2001/05/22 13:05:01 naddy Exp $
--- src/io_ogg123.c.orig Fri Feb 16 03:53:18 2001
+++ src/io_ogg123.c Tue May 22 14:43:45 2001
@@ -52,14 +52,13 @@ static int ogg123_pipe[2];
static const gchar *ogg123_output_devices[] =
{
- "oss",
+ "sun",
+ "arts",
"esd",
- "irix",
- "solaris",
"wav",
NULL
};
-static gint ogg123_output_devices_count = 5;
+static gint ogg123_output_devices_count = 4;
const gchar *ogg123_get_device(gint device)
{

39
audio/gqmpeg/patches/patch-src_mixer_c Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_mixer_c,v 1.1 2001/05/22 13:05:01 naddy Exp $
--- src/mixer.c.orig Thu Jan 4 16:37:50 2001
+++ src/mixer.c Sun May 20 16:45:19 2001
@@ -275,7 +275,11 @@ void mixer_init(gint init_device_id)
mixer_device = getenv("MIXERDEVICE");
if (mixer_device == NULL)
+#ifdef __OpenBSD__
+ mixer_device = "/dev/mixer";
+#else
mixer_device = "/dev/mixer0";
+#endif
if ((fd = open(mixer_device, O_RDWR)) == -1) {
perror(mixer_device);
@@ -352,7 +356,11 @@ static void mixer_set_vol(DeviceData *de
mixer_device = getenv("MIXERDEVICE");
if (mixer_device == NULL)
+#ifdef __OpenBSD__
+ mixer_device = "/dev/mixer";
+#else
mixer_device = "/dev/mixer0";
+#endif
if ((fd = open(mixer_device, O_RDWR)) == -1) {
perror(mixer_device);
@@ -396,7 +404,11 @@ static gint mixer_get_vol(DeviceData *de
mixer_device = getenv("MIXERDEVICE");
if (mixer_device == NULL)
+#ifdef __OpenBSD__
+ mixer_device = "/dev/mixer";
+#else
mixer_device = "/dev/mixer0";
+#endif
if ((fd = open(mixer_device, O_RDWR)) == -1) {
perror(mixer_device);

7
audio/gqmpeg/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2001/03/28 07:48:19 obecian Exp $
@comment $OpenBSD: PLIST,v 1.6 2001/05/22 13:05:02 naddy Exp $
bin/gqmpeg
bin/gqmpeg-shoutcast-plugin.sh
man/man1/gqmpeg.1
@ -9,6 +9,11 @@ share/doc/gqmpeg/README
share/doc/gqmpeg/README.plugin
share/doc/gqmpeg/SKIN-SPECS-V1
share/gqmpeg/skins/SKIN-SPECS
share/locale/cs/LC_MESSAGES/gqmpeg.mo
share/locale/de/LC_MESSAGES/gqmpeg.mo
share/locale/fr/LC_MESSAGES/gqmpeg.mo
share/locale/ja/LC_MESSAGES/gqmpeg.mo
share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
@dirrm share/gqmpeg/skins
@dirrm share/gqmpeg
@dirrm share/doc/gqmpeg