Attachment 149526 Details for Bug 195109 – Fix files path

[patch] Fix files path

lout.patch (text/plain), 9.54 KB, created by Danilo Egea Gondolfo on 2014-11-17 17:50:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo Egea Gondolfo

Created: 2014-11-17 17:50:26 UTC

Size: 9.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 372672)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	lout
> PORTVERSION=	3.40
>+PORTREVISION=	1
> CATEGORIES=	print
> MASTER_SITES=	SAVANNAH
> 
>@@ -15,7 +16,6 @@
> 
> USES=	gmake
> MAKEFILE=	makefile
>-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
> ALL_TARGET=	lout prg2lout
> INSTALL_TARGET=	install installman installdoc
> 
>Index: files/patch-makefile
>===================================================================
>--- files/patch-makefile	(revision 372672)
>+++ files/patch-makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- ./makefile.orig	2012-02-08 05:28:03.000000000 -0200
>-+++ ./makefile	2013-09-29 13:31:07.000000000 -0300
>-@@ -269,11 +269,10 @@
>+--- makefile.orig	2012-02-08 07:28:03 UTC
>++++ makefile
>+@@ -269,11 +269,10 @@ TRACING =
>  # DEBUGGING = 1
>  # TRACING = -g
>  
>@@ -15,7 +15,7 @@
>  
>  LIBFONT = font
>  LIBMAPS = maps
>-@@ -285,23 +284,23 @@
>+@@ -285,23 +284,23 @@ LIBLOCA = locale
>  CHARIN	= 1
>  CHAROUT	= 0
>  
>@@ -46,7 +46,7 @@
>  	  -DOS_DOS=$(OSDOS)					\
>  	  -DOS_MAC=$(OSMAC)					\
>  	  -DDB_FIX=$(DBFIX)					\
>-@@ -349,42 +348,41 @@
>+@@ -349,93 +348,96 @@ all:	lout prg2lout
>  install: lout prg2lout
>  	@echo ""
>  	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
>@@ -54,80 +54,147 @@
> -	chmod 755 $(BINDIR)/lout
> -	cp prg2lout $(BINDIR)/prg2lout
> -	chmod 755 $(BINDIR)/prg2lout
>-+	install -c -s lout $(BINDIR)/lout
>-+	install -c -s prg2lout $(BINDIR)/prg2lout
>++	install -c -s lout $(DESTDIR)$(BINDIR)/lout
>++	install -c -s prg2lout $(DESTDIR)$(BINDIR)/prg2lout
>  	@echo ""
>  	@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
> -	mkdir $(LOUTLIBDIR)
>-+	-mkdir $(LOUTLIBDIR)
>- 	chmod 755 $(LOUTLIBDIR)
>+-	chmod 755 $(LOUTLIBDIR)
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)
>  	@echo ""
> -	mkdir $(LOUTLIBDIR)/$(LIBINCL)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBINCL)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBINCL)
>- 	cp include/* $(LOUTLIBDIR)/$(LIBINCL)
>- 	chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/*
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBINCL)
>+-	cp include/* $(LOUTLIBDIR)/$(LIBINCL)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)
>++	cp include/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/*
>  	@echo ""
> -	mkdir $(LOUTLIBDIR)/$(LIBDATA)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBDATA)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBDATA)
>- 	cp data/* $(LOUTLIBDIR)/$(LIBDATA)
>- 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBDATA)
>+-	cp data/* $(LOUTLIBDIR)/$(LIBDATA)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
>++	cp data/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)/*
>  	@echo ""
> -	mkdir $(LOUTLIBDIR)/$(LIBHYPH)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBHYPH)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBHYPH)
>- 	cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
>- 	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBHYPH)
>+-	cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)
>++	cp hyph/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)/*
>  	@echo ""
> -	mkdir $(LOUTLIBDIR)/$(LIBFONT)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBFONT)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBFONT)
>- 	cp font/* $(LOUTLIBDIR)/$(LIBFONT)
>- 	chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/*
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBFONT)
>+-	cp font/* $(LOUTLIBDIR)/$(LIBFONT)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)
>++	cp font/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)/*
>  	@echo ""
> -	mkdir $(LOUTLIBDIR)/$(LIBMAPS)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBMAPS)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBMAPS)
>- 	cp maps/* $(LOUTLIBDIR)/$(LIBMAPS)
>- 	chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/*
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBMAPS)
>+-	cp maps/* $(LOUTLIBDIR)/$(LIBMAPS)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)
>++	cp maps/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)/*
>  	@echo ""
> -	mkdir $(LOUTLIBDIR)/$(LIBLOCA)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
>-+	touch $(LOUTLIBDIR)/$(LIBLOCA)/.place_holder
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)
>++	touch $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/.place_holder
>  	@echo ""
>  	@echo "(c) Initializing run (should be silent, no errors expected)"
>- 	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
>-@@ -406,6 +404,7 @@
>+-	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
>++	$(DESTDIR)$(BINDIR)/lout -s -x -D $(DESTDIR)$(LOUTLIBDIR)/data \
>++		-H $(DESTDIR)$(LOUTLIBDIR)/hyph \
>++		-I $(DESTDIR)$(LOUTLIBDIR)/include \
>++		$(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/init
>+ 	@echo ""
>+ 	@echo "(d) Changing mode of files just created by initializing run"
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)/*
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)/*
>+ 
>+ installman:
>+ 	@echo ""
>+ 	@echo "Installing manual entries into MANDIR $(MANDIR)"
>+ 	sed -e "s@<BINDIR>@$(BINDIR)@" -e "s@<LIBDIR>@$(LOUTLIBDIR)@"	\
>+ 	    -e "s@<LOUTDOCDIR>@$(LOUTDOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
>+-	man/lout.1 > $(MANDIR)/lout.1
>+-	chmod 644 $(MANDIR)/lout.1
>+-	cp man/prg2lout.1 $(MANDIR)/prg2lout.1
>+-	chmod 644 $(MANDIR)/prg2lout.1
>++	man/lout.1 > $(DESTDIR)$(MANDIR)/lout.1
>++	chmod 644 $(DESTDIR)$(MANDIR)/lout.1
>++	cp man/prg2lout.1 $(DESTDIR)$(MANDIR)/prg2lout.1
>++	chmod 644 $(DESTDIR)$(MANDIR)/prg2lout.1
>+ 
>  installdoc:
>  	@echo ""
>  	@echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it"
>-+	-mkdir -p $(LOUTDOCDIR)
>- 	$(RCOPY) doc/* $(LOUTDOCDIR)
>- 	chmod 755 $(LOUTDOCDIR)
>- 	chmod 755 $(LOUTDOCDIR)/*
>-@@ -416,9 +415,9 @@
>+-	$(RCOPY) doc/* $(LOUTDOCDIR)
>+-	chmod 755 $(LOUTDOCDIR)
>+-	chmod 755 $(LOUTDOCDIR)/*
>+-	chmod 644 $(LOUTDOCDIR)/*/*
>++	-mkdir -p $(DESTDIR)$(LOUTDOCDIR)
>++	$(RCOPY) doc/* $(DESTDIR)$(LOUTDOCDIR)
>++	chmod 755 $(DESTDIR)$(LOUTDOCDIR)
>++	chmod 755 $(DESTDIR)$(LOUTDOCDIR)/*
>++	chmod 644 $(DESTDIR)$(LOUTDOCDIR)/*/*
>+ 
>+ allinstall:	install installman installdoc
>+ 
>  installfr:
>  	@echo ""
>  	@echo "Putting French error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)"
> -	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
> -	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
>-+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
>- 	cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
>- 	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
>-@@ -428,9 +427,9 @@
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
>+-	cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
>+-	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
>+-	       $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
>++	cp locale/msgs.fr $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
>++	gencat $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
>++	       $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
>+ 
>  installde:
>  	@echo ""
>  	@echo "Putting German error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)"
> -	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
>-+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
> -	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
>-+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
>- 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
>- 	cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
>- 	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
>+-	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
>+-	cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
>+-	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
>+-	       $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
>+-	chmod 644 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
>++	-mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
>++	chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
>++	cp locale/msgs.de $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
>++	gencat $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
>++	       $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
>++	chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
>+ 
>+ uninstall:
>+ 	-rm -f  $(BINDIR)/lout $(BINDIR)/prg2lout

Actions: View | Diff

Attachments on bug 195109: 149526