Changeset 99455

Timestamp:

Nov 5, 2012, 9:42:12 PM (12 years ago)

Author:

ryandesign@…

Message:

scotty:

• patch to work with tcl 8.5 (#23752)
• fix mtree violation by manpages
• don't use "system" just to create symlinks
• use notes instead of post-activate ui_msg, and remove notes pertaining to OS X older than Tiger since MacPorts requires Tiger or newer

Location:

trunk/dports/net/scotty

Files:

• Portfile (modified) (5 diffs)
• files/patch-Makefile.in (modified) (1 diff)
• files/patch-configure.in.diff (added)

trunk/dports/net/scotty/Portfile

@@ -5 +5 @@
 name                    scotty
 version                 3.0.0
-revision                5
+revision                6
 categories              net
 maintainers             markd
@@ -28 +28 @@
 
 patchfiles              patch-Makefile.in \
+                        patch-configure.in.diff \
                         patch-tnm-library-init.tcl
 
@@ -34 +35 @@
 startupitem.executable  "${prefix}/bin/nmicmpd"
 
+autoconf.dir            ${worksrcpath}/unix
 configure.dir           ${worksrcpath}/unix
 build.dir               ${worksrcpath}/unix
-destroot.dir            ${worksrcpath}/unix
+
+use_autoconf            yes
 
 configure.args          --exec_prefix=${prefix} \
@@ -56 +59 @@
 
 post-destroot {
-        system "cd ${destroot}${prefix}/bin && ln -sf scotty3.0.0 scotty"
-        system "cd ${destroot}${prefix}/bin && ln -sf tkined1.5.0 tkined"
+        ln -s scotty3.0.0 ${destroot}${prefix}/bin/scotty
+        ln -s tkined1.5.0 ${destroot}${prefix}/bin/tkined
 }
 
 platform darwin 8 {
 pre-install {
-# Replace the LaunchD item with one supporting inetdCompatibility
+# Replace the launchd item with one supporting inetdCompatibility
         file copy -force ${filespath}/org.macports.nmicmpd.plist \
                 ${destroot}${prefix}/etc/LaunchDaemons/org.macports.nmicmpd/
@@ -70 +73 @@
 }
 
-post-activate {
-ui_msg "\n
-To enable the ${prefix}/bin/nmicmpd daemon:
+notes "
+To enable the ${startupitem.executable} daemon:
 
-   1) Add the following line to the /etc/services 'nmicmp 57777/tcp'.
-        Note: You may use another port if necessary.
+   1) Add the following line to /etc/services:
+        nmicmp 57777/tcp
+      (You may use another port if necessary.)
 
-   2) OS X 10.4 (see below for 10.3) - Load the LaunchD script installed by MacPorts:
-        sudo launchctl load -w /Library/LaunchDaemons/org.macports.nmicmpd.plist
+   2) Load the launchd script installed by MacPorts:
+        sudo port load ${name}
 
    3) Reboot and test the nmicmpd daemon:
-        telnet localhost nmicmp
-        ps -ax |grep nmicmpd (The daemon loads only when requested and unloads afterwards)
-
-   Additional instructions for OS X 10.3:
-    a) A startup item was created in /Library/StartupItems
-        Add \"NMICMPD=-YES-\" to the /etc/hostconfig file to run nmicmpd at system boot.
-
-    b) Add an xinetd entry:
-
-        service nmicmp
-        \{
-        socket_type = stream
-        protocol    = tcp
-        wait        = no
-        user        = root
-        server      = ${prefix}/bin/nmicmpd
-        disable     = no
-        \}
-
-    c) Reboot and test as shown in step 3 above.
-\n"
-}
-
+        telnet localhost nmicmp
+        ps -ax | grep nmicmpd
+      (The daemon loads only when requested and unloads afterwards.)
+"

trunk/dports/net/scotty/files/patch-Makefile.in

@@ -1 +1 @@
 --- unix/Makefile.in.orig       2003-06-03 14:44:59.000000000 -0500
-+++ unix/Makefile.in    2010-08-29 19:17:48.000000000 -0500
++++ unix/Makefile.in    2012-11-05 15:34:16.000000000 -0600
+@@ -43,7 +43,7 @@
+ TKI_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/lib/tkined$(TKI_VERSION)
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/share/man
+ 
+ # Directory in which to install the manual entries:
+ MAN1_INSTALL_DIR =     $(MAN_INSTALL_DIR)/man1
 @@ -56,7 +56,7 @@