[37793] trunk/dports/sysutils/moreutils

[Ryan Schmidt]

On Jun 23, 2008, at 11:07, milosh at macports.org wrote:

> Revision: 37793
>           http://trac.macosforge.org/projects/macports/changeset/37793
> Author:   milosh at macports.org
> Date:     2008-06-23 09:07:32 -0700 (Mon, 23 Jun 2008)
> Log Message:
> -----------
> fix install location

If the port previously installed files to the wrong location, and  
this revision fixes that, then you should also increment the port's  
"revision" field, so that everyone who already had the port installed  
will be informed about the upgrade via "port outdated".

On my system, though, it seems like neither before nor after this  
revision does the port install to the right place. Either way it  
installs to ${destroot}/bin instead of to ${destroot}${prefix}/bin.


> Modified Paths:
> --------------
>     trunk/dports/sysutils/moreutils/Portfile
>     trunk/dports/sysutils/moreutils/files/patch-Makefile.diff
>
> Modified: trunk/dports/sysutils/moreutils/Portfile
> ===================================================================
> --- trunk/dports/sysutils/moreutils/Portfile	2008-06-23 16:07:07  
> UTC (rev 37792)
> +++ trunk/dports/sysutils/moreutils/Portfile	2008-06-23 16:07:32  
> UTC (rev 37793)
> @@ -38,8 +38,7 @@
>          ${worksrcpath}/ts ${worksrcpath}/combine \
>          ${worksrcpath}/zrun
>          reinplace "s|docbook2x-man|docbook2man|" ${worksrcpath}/ 
> Makefile
> -        }
> -destroot.env    PREFIX=${destroot}${prefix}
> +}
>
>  variant doc description {Install man pages} {
>          depends_build-append    port:docbook-xml-4.4 port:docbook2X
>
> Modified: trunk/dports/sysutils/moreutils/files/patch-Makefile.diff
> ===================================================================
> --- trunk/dports/sysutils/moreutils/files/patch-Makefile.diff	 
> 2008-06-23 16:07:07 UTC (rev 37792)
> +++ trunk/dports/sysutils/moreutils/files/patch-Makefile.diff	 
> 2008-06-23 16:07:32 UTC (rev 37793)
> @@ -23,15 +23,15 @@
>  -	mkdir -p $(DESTDIR)/usr/bin
>  -	$(INSTALL_BIN) $(BINS) $(DESTDIR)/usr/bin
>  -	install $(PERLSCRIPTS) $(DESTDIR)/usr/bin
> -+	mkdir -p $(DESTDIR)/bin
> -+	$(INSTALL_BIN) $(BINS) $(DESTDIR)/bin
> -+	install $(PERLSCRIPTS) $(DESTDIR)/bin
> ++	mkdir -p $(DESTDIR)/$(PREFIX)/bin
> ++	$(INSTALL_BIN) $(BINS) $(DESTDIR)/$(PREFIX)/bin
> ++	install $(PERLSCRIPTS) $(DESTDIR)/$(PREFIX)/bin
>   	
>  -	mkdir -p $(DESTDIR)/usr/share/man/man1
>  -	install $(MANS) $(DESTDIR)/usr/share/man/man1
>  +install-doc:
> -+	mkdir -p $(DESTDIR)/share/man/man1
> -+	install $(MANS) $(DESTDIR)/share/man/man1
> ++	mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1
> ++	install $(MANS) $(DESTDIR)/$(PREFIX)/share/man/man1
>
>   check: isutf8
>   	./check-isutf8