On Mon, Oct 03, 2005 at 12:44:26AM +0200, viq wrote:
> I saw this once, when trying to create an updated port, and now it happened 
> again, as I'm trying to get a newer version of snownews. I am trying to 
> modify the existing port to work with newer version, I modified also patches 
> that are in the tree, I hope correctly, but what happens is when I 'make 
> fake', the files instead of landing 
> in /usr/ports/www/snownews-test/w-snownews-1.5.7/fake-i386 end up 
> in 
> /usr/ports/www/snownews-test/w-snownews-1.5.7/fake-i386/usr/ports/www/snownews-test/w-snownews-1.5.7/fake-i386
>  
> - what am I doing wrong?
> 
> The differences from the original files attached below: (diff -u orig mod)

> --- ../snownews/patches/patch-Makefile  Wed Oct 13 05:58:42 2004
> +++ patches/patch-Makefile      Sun Oct  2 18:06:01 2005
> @@ -1,13 +1,13 @@
> -$OpenBSD: patch-Makefile,v 1.7 2004/10/13 03:58:42 jolan Exp $
> ---- Makefile.orig      Wed Sep 29 11:28:31 2004
> -+++ Makefile   Tue Oct 12 22:52:36 2004
> +$OpenBSD: patch-Makefile,v 1.8 2005/10/02 18:03:58 viq Exp $
> +--- Makefile.orig      Sun Oct  2 18:03:01 2005
> ++++ Makefile   Sun Oct  2 18:04:14 2005
>  @@ -1,4 +1,4 @@
>  -CC=         gcc
>  +#CC=         gcc
>   MAKE=       make
>   INSTALL=    install
>   LOCALEPATH= $(PREFIX)/share/locale
> -@@ -42,11 +42,11 @@ locales:
> +@@ -42,11 +42,11 @@
>         done
>   
>   manpages:
> @@ -21,12 +21,12 @@
>                 sed s/VERSION/$(VERSION)/ > $(MAN)/$$L/snownews.1; \
>         done
>   
> -@@ -60,7 +60,7 @@ install-bin: snownews
> -       if [ ! -d "$(PREFIX)/bin" ]; then \
> -               mkdir -p $(PREFIX)/bin; \
> +@@ -59,7 +59,7 @@
> +       if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
> +               mkdir -p $(DESTDIR)$(PREFIX)/bin; \
>         fi
> --      $(INSTALL) -s snownews $(PREFIX)/bin
> -+      $(INSTALL) snownews $(PREFIX)/bin
> -       $(INSTALL) opml2snow $(PREFIX)/bin
> - 
> - install-locales: locales
> +-      $(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
> ++      $(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
> +       $(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
> +       if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \
> +               ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow 
> $(DESTDIR)$(PREFIX)/bin/snow2opml; \

maybe adding DESTDIR in patches isn't needed anymore?

-- 
<[EMAIL PROTECTED]>

Reply via email to