[99455] trunk/dports/net/scotty
ryandesign at macports.org
ryandesign at macports.org
Mon Nov 5 13:42:12 PST 2012
Revision: 99455
http://trac.macports.org//changeset/99455
Author: ryandesign at macports.org
Date: 2012-11-05 13:42:12 -0800 (Mon, 05 Nov 2012)
Log 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
Modified Paths:
--------------
trunk/dports/net/scotty/Portfile
trunk/dports/net/scotty/files/patch-Makefile.in
Added Paths:
-----------
trunk/dports/net/scotty/files/patch-configure.in.diff
Modified: trunk/dports/net/scotty/Portfile
===================================================================
--- trunk/dports/net/scotty/Portfile 2012-11-05 20:52:23 UTC (rev 99454)
+++ trunk/dports/net/scotty/Portfile 2012-11-05 21:42:12 UTC (rev 99455)
@@ -4,7 +4,7 @@
name scotty
version 3.0.0
-revision 5
+revision 6
categories net
maintainers markd
description Network management extensions to Tcl that enables \
@@ -27,16 +27,19 @@
port:tk
patchfiles patch-Makefile.in \
+ patch-configure.in.diff \
patch-tnm-library-init.tcl
startupitem.create yes
startupitem.name nmicmpd
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} \
--with-tcl=${prefix} \
--with-tk=${prefix}
@@ -55,13 +58,13 @@
}
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/
reinplace "s|__PREFIX__|${prefix}|g" \
@@ -69,37 +72,18 @@
}
}
-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.)
+"
Modified: trunk/dports/net/scotty/files/patch-Makefile.in
===================================================================
--- trunk/dports/net/scotty/files/patch-Makefile.in 2012-11-05 20:52:23 UTC (rev 99454)
+++ trunk/dports/net/scotty/files/patch-Makefile.in 2012-11-05 21:42:12 UTC (rev 99455)
@@ -1,5 +1,14 @@
--- 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 @@
# To change the compiler switches, for example to change from -O
Added: trunk/dports/net/scotty/files/patch-configure.in.diff
===================================================================
--- trunk/dports/net/scotty/files/patch-configure.in.diff (rev 0)
+++ trunk/dports/net/scotty/files/patch-configure.in.diff 2012-11-05 21:42:12 UTC (rev 99455)
@@ -0,0 +1,58 @@
+--- unix/configure.in.orig 2003-06-03 14:44:59.000000000 -0500
++++ unix/configure.in 2012-11-05 10:09:17.000000000 -0600
+@@ -9,14 +9,14 @@
+
+ TNM_VERSION=3.0.0
+ TKI_VERSION=1.5.0
+-TCL_VERSION=8.4
+-TK_VERSION=8.4
++TCL_VERSION=8.5
++TK_VERSION=8.5
+
+ #----------------------------------------------------------------------------
+ # Load the tcl configuration file.
+ #----------------------------------------------------------------------------
+
+-AC_PATH_PROG(tclsh,tclsh8.4)
++AC_PATH_PROG(tclsh,tclsh)
+ if test -n "$tclsh" ; then
+ tclsh_prefix=`dirname $tclsh`
+ tclsh_prefix=`dirname $tclsh_prefix`
+@@ -71,9 +71,6 @@
+
+ AC_MSG_CHECKING(for tcl version)
+ AC_MSG_RESULT("$TCL_VERSION")
+-if test "$TCL_VERSION" != "8.4" ; then
+- AC_MSG_ERROR("Tcl version 8.4 needed")
+-fi
+
+ BUILD_TARGETS="$BUILD_TARGETS scotty"
+ INSTALL_TARGETS="$INSTALL_TARGETS tnm-install"
+@@ -82,7 +79,7 @@
+ # Load the tk configuration file.
+ #----------------------------------------------------------------------------
+
+-AC_PATH_PROG(wish,wish8.4)
++AC_PATH_PROG(wish,wish)
+ if test -n "$wish" ; then
+ wish_prefix=`dirname $wish`
+ wish_prefix=`dirname $wish_prefix`
+@@ -122,9 +119,6 @@
+
+ AC_MSG_CHECKING(for tk version)
+ AC_MSG_RESULT("$TK_VERSION")
+- if test "$TK_VERSION" != "8.4" ; then
+- AC_MSG_ERROR("Tk version 8.4 needed")
+- fi
+
+ BUILD_TARGETS="$BUILD_TARGETS tkined"
+ INSTALL_TARGETS="$INSTALL_TARGETS tki-install"
+@@ -259,7 +253,7 @@
+ # Check for sin_len field in struct sockaddr (BSD-ish).
+ #----------------------------------------------------------------------------
+
+-AC_CHECK_TYPE(socklen_t,AC_DEFINE(HAVE_SOCKLEN_T))
++AC_CHECK_TYPE(socklen_t,AC_DEFINE(HAVE_SOCKLEN_T),,[#include <sys/socket.h>])
+
+ AC_CACHE_CHECK([for 'sa_len' in 'struct sockaddr'], ac_cv_struct_sa_len,
+ [AC_TRY_COMPILE([#include <sys/types.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121105/78cee443/attachment.html>
More information about the macports-changes
mailing list