Bug 8946 - games/netris, lang/sr both install PREFIX/bin/sr
Summary: games/netris, lang/sr both install PREFIX/bin/sr
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 1998-12-03 06:00 UTC by josh
Modified: 1999-01-10 19:02 UTC (History)
0 users

See Also:


Attachments
file.diff (657 bytes, patch)
1998-12-03 06:00 UTC, josh
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description josh 1998-12-03 06:00:00 UTC
The lang/sr port installs a bin/sr; Avoid conflict by installing
the sr here as netrissr.
Comment 1 josh 1998-12-03 06:08:44 UTC
Oops, forgot PLIST.

> >Environment: 
> 
> ports/games/netris/patches/patch-aa     1.3
  ports/games/netris/pkg/PLIST            1.3

> >Description: 
> 
> The lang/sr port installs a bin/sr; Avoid conflict by installing
> the sr here as netrissr.
> 
> >How-To-Repeat: 
> >Fix: 
> 	
> --- ports/games/netris/patches/patch-aa~	Mon Sep 28 22:30:39 1998
> +++ ports/games/netris/patches/patch-aa	Wed Dec  2 20:39:15 1998
> @@ -1,5 +1,5 @@
> ---- Configure.orig	Sat Feb 10 04:41:40 1996
> -+++ Configure	Sun Sep 27 18:49:59 1998
> +--- Configure.orig	Sat Feb 10 02:41:40 1996
> ++++ Configure	Wed Dec  2 20:38:49 1998
>  @@ -159,9 +159,12 @@
>   PROG = netris
>   HEADERS = netris.h
> @@ -20,7 +20,7 @@
>  +
>  +install:
>  +	install -c -o bin -g bin -s -m 755 $(PROG) $(DESTDIR)
> -+	install -c -o bin -g bin -s -m 755 sr $(DESTDIR)
> ++	install -c -o bin -g bin -s -m 755 netrissr $(DESTDIR)
>   
>   ##### DO NOT EDIT OR DELETE THIS LINE, it's needed by make depend #####
>   END

--- ports/games/netris/pkg/PLIST~	Wed Aug 12 19:23:08 1998
+++ ports/games/netris/pkg/PLIST	Wed Dec  2 22:06:44 1998
@@ -1,2 +1,2 @@
 bin/netris
-bin/sr
+bin/netrissr

-- 
Josh Gilliam                    <josh@quick.net>
6745 Washington Ave #198          1 626 968 5232
Whittier CA 90601-4325 USA
Comment 2 josh 1998-12-03 11:53:05 UTC
>  Oops, forgot PLIST.

>  > -+	install -c -o bin -g bin -s -m 755 sr $(DESTDIR)
>  > ++	install -c -o bin -g bin -s -m 755 netrissr $(DESTDIR)

Oops again.

Two mistakes in a PR for a 2 line change - man, I feel stupid.
Forget content of PR and my first reply. Correct patch below.

--- ports/games/netris/pkg/PLIST~	Wed Aug 12 19:23:08 1998
+++ ports/games/netris/pkg/PLIST	Thu Dec  3 03:44:21 1998
@@ -1,2 +1,2 @@
 bin/netris
-bin/sr
+bin/netrissr
--- ports/games/netris/patches/patch-aa~	Mon Sep 28 22:30:39 1998
+++ ports/games/netris/patches/patch-aa~	Thu Dec  3 03:41:31 1998
@@ -1,5 +1,5 @@
---- Configure.orig	Sat Feb 10 04:41:40 1996
-+++ Configure	Sun Sep 27 18:49:59 1998
+--- Configure.orig	Sat Feb 10 02:41:40 1996
++++ Configure	Wed Dec  2 20:38:49 1998
 @@ -159,9 +159,12 @@
  PROG = netris
  HEADERS = netris.h
@@ -20,7 +20,7 @@
 +
 +install:
 +	install -c -o bin -g bin -s -m 755 $(PROG) $(DESTDIR)
-+	install -c -o bin -g bin -s -m 755 sr $(DESTDIR)
++	install -c -o bin -g bin -s -m 755 sr $(DESTDIR)/netrissr
  
  ##### DO NOT EDIT OR DELETE THIS LINE, it's needed by make depend #####
  END


-- 
Josh Gilliam                    <josh@quick.net>
6745 Washington Ave #198          1 626 968 5232
Whittier CA 90601-4325 USA
Comment 3 Steve Price freebsd_committer freebsd_triage 1999-01-10 19:00:24 UTC
State Changed
From-To: open->closed

Change the name of the binary in the netris port to sample-robot to 
avoid the name clash.