Date: Fri, 14 Mar 2014 17:15:34 +0900 (JST) From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Cc: turutani@scphys.kyoto-u.ac.jp Subject: ports/187569: change executable's name in biology/tinker, to avoid conflicts Message-ID: <201403140815.s2E8FYDd049339@h116.65.226.10.32118.vlan.kuins.net> Resent-Message-ID: <201403140820.s2E8K0Co092722@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187569
>Category: ports
>Synopsis: change executable's name in biology/tinker, to avoid conflicts
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 14 08:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tsurutani Naoki
>Release: FreeBSD 8.4-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD h116.65.226.10.32118.vlan.kuins.net 8.4-PRERELEASE FreeBSD 8.4-PRERELEASE #1 r249390: Thu May 2 17:05:06 JST 2013 turutani@h116.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER13 amd64
>Description:
biology/tinker conflicts with textproc/hunspell.
this is already reported and marked as "CONFLICTS",
but this prevents installing mail/thunderbird, www/libxul, etc.
biology/tinker is not required by the other ports, and
i think only one executable "analyze" with tinker should be changed
to "analyze_t" or any other names.
this lets many people to install thunderbird and tinker on the same host.
if someone who thinks this bothers him, set alias in his shell.
>How-To-Repeat:
>Fix:
here is a patch only for tinker. please remove CONFLICTS line from hunspell' Makefile.
diff -urN tinker.orig/Makefile tinker/Makefile
--- tinker.orig/Makefile 2014-03-11 05:55:20.000000000 +0900
+++ tinker/Makefile 2014-03-14 17:04:29.000000000 +0900
@@ -12,8 +12,6 @@
RESTRICTED= author requests no distribution except from his FTP site
-CONFLICTS_INSTALL= hunspell-[0-9]*
-
OPTIONS_DEFINE= OPTIMIZED_FFLAGS DOCS EXAMPLES
OPTIMIZED_FFLAGS_DESC= compilation optimizations
diff -urN tinker.orig/files/patch-make__Makefile tinker/files/patch-make__Makefile
--- tinker.orig/files/patch-make__Makefile 2013-12-19 03:27:04.000000000 +0900
+++ tinker/files/patch-make__Makefile 2014-03-14 17:00:09.000000000 +0900
@@ -1,5 +1,5 @@
---- make/Makefile.orig 2012-06-29 14:51:42.000000000 +0900
-+++ make/Makefile 2012-11-10 00:12:19.000000000 +0900
+--- make/Makefile.orig 2013-07-14 11:23:53.000000000 +0900
++++ make/Makefile 2014-03-14 16:59:17.000000000 +0900
@@ -30,9 +30,9 @@
## LINKDIR Linked Copies of TINKER Executables
##
@@ -73,7 +73,7 @@
all: ${EXEFILES}
-@@ -612,70 +625,70 @@
+@@ -612,74 +625,74 @@
rm -f *.o *.a *.x
listing:
@@ -143,7 +143,7 @@
- mv xyzpdb.x $(BINDIR)/xyzpdb
- mv xyzsybyl.x $(BINDIR)/xyzsybyl
+ ${BSD_INSTALL_PROGRAM} alchemy.x $(BINDIR)/alchemy
-+ ${BSD_INSTALL_PROGRAM} analyze.x $(BINDIR)/analyze
++ ${BSD_INSTALL_PROGRAM} analyze.x $(BINDIR)/analyze_t
+ ${BSD_INSTALL_PROGRAM} anneal.x $(BINDIR)/anneal
+ ${BSD_INSTALL_PROGRAM} archive.x $(BINDIR)/archive
+ ${BSD_INSTALL_PROGRAM} bar.x $(BINDIR)/bar
@@ -206,3 +206,17 @@
remove_links:
rm -f $(LINKDIR)/alchemy
+- rm -f $(LINKDIR)/analyze
++ rm -f $(LINKDIR)/analyze_t
+ rm -f $(LINKDIR)/anneal
+ rm -f $(LINKDIR)/archive
+ rm -f $(LINKDIR)/bar
+@@ -742,7 +755,7 @@
+
+ create_links:
+ ln -s $(BINDIR)/alchemy $(LINKDIR)/alchemy
+- ln -s $(BINDIR)/analyze $(LINKDIR)/analyze
++ ln -s $(BINDIR)/analyze_t $(LINKDIR)/analyze_t
+ ln -s $(BINDIR)/anneal $(LINKDIR)/anneal
+ ln -s $(BINDIR)/archive $(LINKDIR)/archive
+ ln -s $(BINDIR)/bar $(LINKDIR)/bar
diff -urN tinker.orig/pkg-plist tinker/pkg-plist
--- tinker.orig/pkg-plist 2013-07-15 23:50:22.000000000 +0900
+++ tinker/pkg-plist 2014-03-14 17:00:37.000000000 +0900
@@ -1,5 +1,5 @@
bin/alchemy
-bin/analyze
+bin/analyze_t
bin/anneal
bin/archive
bin/bar
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403140815.s2E8FYDd049339>