From ffe2cacb7486c1c15fb8c3c95de327dcd8913de6 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Mon, 8 Apr 2002 19:23:18 +0000
Subject: [PATCH] gettext cleanup; don't install outside fake root

---
 audio/lopster/Makefile                        |  7 ++-
 audio/lopster/patches/patch-po_Makefile_in_in | 58 +++++++++++++++++++
 audio/lopster/patches/patch-src_handler_c     |  6 +-
 audio/lopster/pkg/PLIST                       |  4 +-
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 audio/lopster/patches/patch-po_Makefile_in_in

diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index c9659eeb19f..bad08566966 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/12/23 03:38:01 obecian Exp $
+# $OpenBSD: Makefile,v 1.10 2002/04/08 19:23:18 naddy Exp $
 
 COMMENT=	"full featured GTK Napster client"
 DISTNAME=	lopster-0.9.9
@@ -19,9 +19,12 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
+MODULES=	gettext
+
 USE_X11=	Yes
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/audio/lopster/patches/patch-po_Makefile_in_in b/audio/lopster/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..a6c2c4bb283
--- /dev/null
+++ b/audio/lopster/patches/patch-po_Makefile_in_in
@@ -0,0 +1,58 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.1 2002/04/08 19:23:18 naddy Exp $
+--- po/Makefile.in.in.orig	Thu Jan 25 18:30:28 2001
++++ po/Makefile.in.in	Mon Apr  8 21:14:35 2002
+@@ -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
+ 
diff --git a/audio/lopster/patches/patch-src_handler_c b/audio/lopster/patches/patch-src_handler_c
index 9ec7d6ee060..33705769b4d 100644
--- a/audio/lopster/patches/patch-src_handler_c
+++ b/audio/lopster/patches/patch-src_handler_c
@@ -1,5 +1,6 @@
---- src/handler.c~	Mon May 28 16:11:51 2001
-+++ src/handler.c	Sat Dec 22 18:51:32 2001
+$OpenBSD: patch-src_handler_c,v 1.3 2002/04/08 19:23:18 naddy Exp $
+--- src/handler.c.orig	Tue May 29 01:11:51 2001
++++ src/handler.c	Mon Apr  8 21:11:07 2002
 @@ -1220,7 +1220,7 @@ HANDLER(cmd_banlist_entry) {
    pos[0] = 0;
    strcpy(tstr[3], data);
@@ -9,4 +10,3 @@
    sprintf(tstr[2], "%s", ctime(&l1));
    gtk_clist_append(GTK_CLIST(temp), list);
  }
-
diff --git a/audio/lopster/pkg/PLIST b/audio/lopster/pkg/PLIST
index 807537e49c2..30c752f2756 100644
--- a/audio/lopster/pkg/PLIST
+++ b/audio/lopster/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/12/23 03:38:01 obecian Exp $
+@comment $OpenBSD: PLIST,v 1.6 2002/04/08 19:23:18 naddy Exp $
 bin/lopster
+lib/locale/de/LC_MESSAGES/lopster.mo
+lib/locale/fr/LC_MESSAGES/lopster.mo
 share/lopster/pixmaps/arrowd.xpm
 share/lopster/pixmaps/arrowl.xpm
 share/lopster/pixmaps/arrowr.xpm