gettext cleanup; don't install outside fake root

This commit is contained in:
naddy 2002-04-08 19:23:18 +00:00
parent d1bc770093
commit ffe2cacb74
4 changed files with 69 additions and 6 deletions

View File

@ -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" COMMENT= "full featured GTK Napster client"
DISTNAME= lopster-0.9.9 DISTNAME= lopster-0.9.9
@ -19,9 +19,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
MODULES= gettext
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -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

View File

@ -1,5 +1,6 @@
--- src/handler.c~ Mon May 28 16:11:51 2001 $OpenBSD: patch-src_handler_c,v 1.3 2002/04/08 19:23:18 naddy Exp $
+++ src/handler.c Sat Dec 22 18:51:32 2001 --- 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) { @@ -1220,7 +1220,7 @@ HANDLER(cmd_banlist_entry) {
pos[0] = 0; pos[0] = 0;
strcpy(tstr[3], data); strcpy(tstr[3], data);
@ -9,4 +10,3 @@
sprintf(tstr[2], "%s", ctime(&l1)); sprintf(tstr[2], "%s", ctime(&l1));
gtk_clist_append(GTK_CLIST(temp), list); gtk_clist_append(GTK_CLIST(temp), list);
} }

View File

@ -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 bin/lopster
lib/locale/de/LC_MESSAGES/lopster.mo
lib/locale/fr/LC_MESSAGES/lopster.mo
share/lopster/pixmaps/arrowd.xpm share/lopster/pixmaps/arrowd.xpm
share/lopster/pixmaps/arrowl.xpm share/lopster/pixmaps/arrowl.xpm
share/lopster/pixmaps/arrowr.xpm share/lopster/pixmaps/arrowr.xpm