Attachment 38274 Details for Bug 60624 – file.diff

[patch] file.diff

file.diff (text/plain), 12.49 KB, created by tkato on 2003-12-27 14:10:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-12-27 14:10:15 UTC

Size: 12.49 KB

patch

obsolete

>diff -urN /usr/ports/net/gnome-mud/Makefile net/gnome-mud/Makefile
>--- /usr/ports/net/gnome-mud/Makefile	Sun Aug 24 20:02:50 2003
>+++ net/gnome-mud/Makefile	Fri Dec 26 21:58:08 2003
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	gnome-mud
>-PORTVERSION=	0.10.2
>+PORTVERSION=	0.10.4
> CATEGORIES=	net gnome
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	amcl
>+MASTER_SITES=	${MASTER_SITE_GNOME}
>+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	GTK-based MUD client with triggers, aliases, colors, etc
>@@ -24,10 +24,12 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib"
>+MAKE_ARGS=	INTLTOOL_MERGE="${LOCALBASE}/bin/intltool-merge"
> 
>-MAN1=	gnome-mud.1
>+MAN6=		gnome-mud.6
> 
> post-patch:
>-	@cd ${WRKSRC}/doc && ${LN} -sf gnome-mud.6 gnome-mud.1
>+	@${REINPLACE_CMD} -e \
>+		's|prefix)/games|prefix)/bin|g' ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/net/gnome-mud/distinfo net/gnome-mud/distinfo
>--- /usr/ports/net/gnome-mud/distinfo	Sun Aug 24 20:02:50 2003
>+++ net/gnome-mud/distinfo	Fri Dec 26 17:21:24 2003
>@@ -1 +1 @@
>-MD5 (gnome-mud-0.10.2.tar.gz) = cd30dd4edb79ea03b59bb62b86b16ae0
>+MD5 (gnome-mud-0.10.4.tar.gz) = 6879fcb445309c0eea8f40ad1f1829ee
>diff -urN /usr/ports/net/gnome-mud/files/patch-doc::Makefile.in net/gnome-mud/files/patch-doc::Makefile.in
>--- /usr/ports/net/gnome-mud/files/patch-doc::Makefile.in	Sun Aug 24 06:49:23 2003
>+++ net/gnome-mud/files/patch-doc::Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,108 +0,0 @@
>---- doc/Makefile.in.dist	Wed Jul  9 22:09:21 2003
>-+++ doc/Makefile.in	Sun Aug 24 01:27:29 2003
>-@@ -132,7 +132,7 @@
>- 
>- SUBDIRS = gnome-mud-manual gnome-mud-plugin-api omf-install
>- 
>--man_MANS = gnome-mud.6
>-+man_MANS = gnome-mud.1
>- 
>- EXTRA_DIST = xmldocs.make $(man_MANS)
>- subdir = doc
>-@@ -162,15 +162,15 @@
>- 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
>- uninstall-info-am:
>- 
>--man6dir = $(mandir)/man6
>--install-man6: $(man6_MANS) $(man_MANS)
>-+man1dir = $(mandir)/man1
>-+install-man1: $(man1_MANS) $(man_MANS)
>- 	@$(NORMAL_INSTALL)
>--	$(mkinstalldirs) $(DESTDIR)$(man6dir)
>--	@list='$(man6_MANS) $(dist_man6_MANS) $(nodist_man6_MANS)'; \
>-+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
>-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
>- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
>- 	for i in $$l2; do \
>- 	  case "$$i" in \
>--	    *.6*) list="$$list $$i" ;; \
>-+	    *.1*) list="$$list $$i" ;; \
>- 	  esac; \
>- 	done; \
>- 	for i in $$list; do \
>-@@ -180,16 +180,16 @@
>- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
>- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
>- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
>--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man6dir)/$$inst"; \
>--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man6dir)/$$inst; \
>-+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
>-+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
>- 	done
>--uninstall-man6:
>-+uninstall-man1:
>- 	@$(NORMAL_UNINSTALL)
>--	@list='$(man6_MANS) $(dist_man6_MANS) $(nodist_man6_MANS)'; \
>-+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
>- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
>- 	for i in $$l2; do \
>- 	  case "$$i" in \
>--	    *.6*) list="$$list $$i" ;; \
>-+	    *.1*) list="$$list $$i" ;; \
>- 	  esac; \
>- 	done; \
>- 	for i in $$list; do \
>-@@ -197,8 +197,8 @@
>- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
>- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
>- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
>--	  echo " rm -f $(DESTDIR)$(man6dir)/$$inst"; \
>--	  rm -f $(DESTDIR)$(man6dir)/$$inst; \
>-+	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
>-+	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
>- 	done
>- 
>- # This directory's subdirectories are mostly independent; you can cd
>-@@ -332,7 +332,7 @@
>- all-am: Makefile $(MANS)
>- installdirs: installdirs-recursive
>- installdirs-am:
>--	$(mkinstalldirs) $(DESTDIR)$(man6dir)
>-+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
>- 
>- install: install-recursive
>- install-exec: install-exec-recursive
>-@@ -379,7 +379,7 @@
>- 
>- install-info: install-info-recursive
>- 
>--install-man: install-man6
>-+install-man: install-man1
>- 
>- installcheck-am:
>- 
>-@@ -395,7 +395,7 @@
>- 
>- uninstall-info: uninstall-info-recursive
>- 
>--uninstall-man: uninstall-man6
>-+uninstall-man: uninstall-man1
>- 
>- .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
>- 	clean-generic clean-recursive distclean distclean-generic \
>-@@ -404,13 +404,13 @@
>- 	install-data install-data-am install-data-recursive \
>- 	install-exec install-exec-am install-exec-recursive \
>- 	install-info install-info-am install-info-recursive install-man \
>--	install-man6 install-recursive install-strip installcheck \
>-+	install-man1 install-recursive install-strip installcheck \
>- 	installcheck-am installdirs installdirs-am \
>- 	installdirs-recursive maintainer-clean maintainer-clean-generic \
>- 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
>- 	mostlyclean-recursive tags tags-recursive uninstall \
>- 	uninstall-am uninstall-info-am uninstall-info-recursive \
>--	uninstall-man uninstall-man6 uninstall-recursive
>-+	uninstall-man uninstall-man1 uninstall-recursive
>- 
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -urN /usr/ports/net/gnome-mud/files/patch-doc::gnome-mud.6 net/gnome-mud/files/patch-doc::gnome-mud.6
>--- /usr/ports/net/gnome-mud/files/patch-doc::gnome-mud.6	Sun Aug 24 06:49:23 2003
>+++ net/gnome-mud/files/patch-doc::gnome-mud.6	Thu Jan  1 09:00:00 1970
>@@ -1,16 +0,0 @@
>---- doc/gnome-mud.6.orig	Wed Jul  3 22:33:07 2002
>-+++ doc/gnome-mud.6	Sun Aug 24 01:32:57 2003
>-@@ -1,11 +1,11 @@
>- .\" Hey, EMACS: -*- nroff -*-
>--.\" gnome-mud.6 is copyright 2000-2002 by
>-+.\" gnome-mud.1 is copyright 2000-2002 by
>- .\" Jordi Mallach <jordi@sindominio.net>
>- .\"
>- .\" This is free documentation, see the latest version of the GNU General
>- .\" Public License for copying conditions. There is NO warranty.
>- .\"
>--.TH GNOME-MUD 6 "January 5, 2002"
>-+.TH GNOME-MUD 1 "January 5, 2002"
>- .SH NAME
>- gnome-mud \- a mud client for the GNOME Desktop Environment.
>- .SH SYNOPSIS
>diff -urN /usr/ports/net/gnome-mud/files/patch-src::Makefile.in net/gnome-mud/files/patch-src::Makefile.in
>--- /usr/ports/net/gnome-mud/files/patch-src::Makefile.in	Sun Aug 24 06:49:23 2003
>+++ net/gnome-mud/files/patch-src::Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,127 +0,0 @@
>---- src/Makefile.in.orig	Sun Aug 24 01:34:22 2003
>-+++ src/Makefile.in	Sun Aug 24 01:35:10 2003
>-@@ -130,8 +130,6 @@
>- install_sh = @install_sh@
>- pythonpath = @pythonpath@
>- 
>--GMUD_DEBUG = -Wall -O0 -g
>--
>- localedir = $(prefix)/share/locale
>- INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
>- 	   -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" \
>-@@ -144,8 +142,7 @@
>- LDADD = $(GMUD_LIBS) $(Z_LIBS)
>- AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
>- 
>--gamesdir = $(prefix)/games
>--games_PROGRAMS = gnome-mud
>-+bin_PROGRAMS = gnome-mud
>- 
>- gnome_mud_SOURCES = data.c init.c gnome-mud.c gnome-mud.h keybind.c log.c \
>- 		    map.c map.h map-link.c mccpDecompress.c mccpDecompress.h \
>-@@ -156,8 +153,8 @@
>- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>- CONFIG_HEADER = $(top_builddir)/config.h
>- CONFIG_CLEAN_FILES =
>--games_PROGRAMS = gnome-mud$(EXEEXT)
>--PROGRAMS = $(games_PROGRAMS)
>-+bin_PROGRAMS = gnome-mud$(EXEEXT)
>-+PROGRAMS = $(bin_PROGRAMS)
>- 
>- am_gnome_mud_OBJECTS = data.$(OBJEXT) init.$(OBJEXT) gnome-mud.$(OBJEXT) \
>- 	keybind.$(OBJEXT) log.$(OBJEXT) map.$(OBJEXT) \
>-@@ -205,29 +202,29 @@
>- 	cd $(top_builddir) && \
>- 	  CONFIG_HEADERS= CONFIG_LINKS= \
>- 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
>--install-gamesPROGRAMS: $(games_PROGRAMS)
>-+install-binPROGRAMS: $(bin_PROGRAMS)
>- 	@$(NORMAL_INSTALL)
>--	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
>--	@list='$(games_PROGRAMS)'; for p in $$list; do \
>-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
>-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
>- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
>- 	  if test -f $$p \
>- 	  ; then \
>- 	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
>--	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(gamesdir)/$$f"; \
>--	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(gamesdir)/$$f; \
>-+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
>-+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
>- 	  else :; fi; \
>- 	done
>- 
>--uninstall-gamesPROGRAMS:
>-+uninstall-binPROGRAMS:
>- 	@$(NORMAL_UNINSTALL)
>--	@list='$(games_PROGRAMS)'; for p in $$list; do \
>-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
>- 	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
>--	  echo " rm -f $(DESTDIR)$(gamesdir)/$$f"; \
>--	  rm -f $(DESTDIR)$(gamesdir)/$$f; \
>-+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
>-+	  rm -f $(DESTDIR)$(bindir)/$$f; \
>- 	done
>- 
>--clean-gamesPROGRAMS:
>--	-test -z "$(games_PROGRAMS)" || rm -f $(games_PROGRAMS)
>-+clean-binPROGRAMS:
>-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
>- gnome-mud$(EXEEXT): $(gnome_mud_OBJECTS) $(gnome_mud_DEPENDENCIES) 
>- 	@rm -f gnome-mud$(EXEEXT)
>- 	$(LINK) $(gnome_mud_LDFLAGS) $(gnome_mud_OBJECTS) $(gnome_mud_LDADD) $(LIBS)
>-@@ -331,7 +328,7 @@
>- all-am: Makefile $(PROGRAMS)
>- 
>- installdirs:
>--	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
>-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
>- 
>- install: install-am
>- install-exec: install-exec-am
>-@@ -358,7 +355,7 @@
>- 	@echo "it deletes files that may require special tools to rebuild."
>- clean: clean-am
>- 
>--clean-am: clean-gamesPROGRAMS clean-generic mostlyclean-am
>-+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
>- 
>- distclean: distclean-am
>- 
>-@@ -373,9 +370,9 @@
>- 
>- info-am:
>- 
>--install-data-am: install-gamesPROGRAMS
>-+install-data-am:
>- 
>--install-exec-am:
>-+install-exec-am: install-binPROGRAMS
>- 
>- install-info: install-info-am
>- 
>-@@ -391,18 +388,18 @@
>- 
>- mostlyclean-am: mostlyclean-compile mostlyclean-generic
>- 
>--uninstall-am: uninstall-gamesPROGRAMS uninstall-info-am
>-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
>- 
>--.PHONY: GTAGS all all-am check check-am clean clean-gamesPROGRAMS \
>-+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
>- 	clean-generic distclean distclean-compile distclean-depend \
>- 	distclean-generic distclean-tags distdir dvi dvi-am info \
>--	info-am install install-am install-data install-data-am \
>--	install-exec install-exec-am install-gamesPROGRAMS install-info \
>-+	info-am install install-am install-binPROGRAMS install-data \
>-+	install-data-am install-exec install-exec-am install-info \
>- 	install-info-am install-man install-strip installcheck \
>- 	installcheck-am installdirs maintainer-clean \
>- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
>- 	mostlyclean-generic tags uninstall uninstall-am \
>--	uninstall-gamesPROGRAMS uninstall-info-am
>-+	uninstall-binPROGRAMS uninstall-info-am
>- 
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -urN /usr/ports/net/gnome-mud/pkg-plist net/gnome-mud/pkg-plist
>--- /usr/ports/net/gnome-mud/pkg-plist	Sun Aug 24 20:02:52 2003
>+++ net/gnome-mud/pkg-plist	Sat Dec 27 13:31:25 2003
>@@ -23,13 +23,26 @@
> share/gnome/help/gnome-mud/C/gnome-mud-manual.xml
> share/gnome/help/gnome-mud/C/gnome-mud-plugin-api.xml
> share/gnome/help/gnome-mud/C/monitor.py
>+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-mud/gnome-mud-manual-C.omf 2>/dev/null || true
> share/gnome/omf/gnome-mud/gnome-mud-manual-C.omf
>+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-mud/gnome-mud-manual-.omf 2>/dev/null || true
>+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-mud/gnome-mud-plugin-api-C.omf 2>/dev/null || true
> share/gnome/omf/gnome-mud/gnome-mud-plugin-api-C.omf
>+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-mud/gnome-mud-plugin-api-C.omf 2>/dev/null || true
>+share/locale/az/LC_MESSAGES/gnome-mud.mo
> share/locale/ca/LC_MESSAGES/gnome-mud.mo
>+share/locale/cs/LC_MESSAGES/gnome-mud.mo
> share/locale/de/LC_MESSAGES/gnome-mud.mo
> share/locale/es/LC_MESSAGES/gnome-mud.mo
> share/locale/fr/LC_MESSAGES/gnome-mud.mo
>+share/locale/hr/LC_MESSAGES/gnome-mud.mo
> share/locale/mk/LC_MESSAGES/gnome-mud.mo
>+share/locale/ml/LC_MESSAGES/gnome-mud.mo
>+share/locale/nl/LC_MESSAGES/gnome-mud.mo
>+share/locale/pl/LC_MESSAGES/gnome-mud.mo
>+share/locale/pt/LC_MESSAGES/gnome-mud.mo
>+share/locale/sr/LC_MESSAGES/gnome-mud.mo
>+share/locale/sr@Latn/LC_MESSAGES/gnome-mud.mo
> share/locale/sv/LC_MESSAGES/gnome-mud.mo
> share/locale/tr/LC_MESSAGES/gnome-mud.mo
> @dirrm share/gnome/omf/gnome-mud

Actions: View | Diff

Attachments on bug 60624: 38274