[83835] trunk/dports/comms/kermit

ryandesign at macports.org ryandesign at macports.org
Sun Sep 11 09:11:15 PDT 2011


Revision: 83835
          http://trac.macports.org/changeset/83835
Author:   ryandesign at macports.org
Date:     2011-09-11 09:11:15 -0700 (Sun, 11 Sep 2011)
Log Message:
-----------
kermit:

 * update to 9.0.302
 * indicate license (now standard BSD)
 * respect build_arch
 * build universal when universal variant is selected
 * fix livecheck

See #31168

Modified Paths:
--------------
    trunk/dports/comms/kermit/Portfile
    trunk/dports/comms/kermit/files/patch-ckuus5.c
    trunk/dports/comms/kermit/files/patch-makefile

Modified: trunk/dports/comms/kermit/Portfile
===================================================================
--- trunk/dports/comms/kermit/Portfile	2011-09-11 16:10:42 UTC (rev 83834)
+++ trunk/dports/comms/kermit/Portfile	2011-09-11 16:11:15 UTC (rev 83835)
@@ -2,16 +2,19 @@
 
 PortSystem 1.0
 name			kermit
-version			8.0.211
+version			9.0.302
 categories		comms
 maintainers		nomaintainer
 distname		cku[lindex [split ${version} .] end]
 platforms		darwin freebsd
+license			BSD
+
+homepage		http://www.columbia.edu/kermit/ckermit.html
+
 master_sites		ftp://kermit.columbia.edu/kermit/archives/ \
+			http://kermit.columbia.edu/ftp/archives/ \
 			ftp://ftp.icm.edu.pl/pub/kermit/archives/
-checksums		md5 5767ec5e6ff0857cbfe2d3ec1ee0e2bc \
-				sha1 cd5e0524d27fea0275a0938da2a5fc115e0978b8
-homepage		http://www.kermit-project.org/
+
 description		Serial and network communications package.
 long_description	C-Kermit is a combined serial and network \
 			communication software package offering \
@@ -22,12 +25,15 @@
 			numeric and alphanumeric paging, and \
 			automation of communication tasks.
 
+checksums		rmd160  ef3a71b5a42868c80408ac09662d00b71da0b0c8 \
+			sha256  0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711
+
 extract.mkdir   yes
 build.target
 patchfiles	patch-makefile patch-ckuus5.c
 
 platform darwin {
-	build.target		macosx103
+	build.target		macosx
 }
 
 platform freebsd {
@@ -38,15 +44,15 @@
 
 configure {
 	reinplace "s|@@prefix@@|${prefix}|g"	${worksrcpath}/ckuus5.c ${worksrcpath}/makefile
-	reinplace "s|CC= cc|CC= ${configure.cc}|g"	${worksrcpath}/makefile
-	reinplace "s|CC2= cc|CC2= ${configure.cc}|g"	${worksrcpath}/makefile
+	reinplace {s| CC=$(CC) | CC="$(CC)" |g} ${worksrcpath}/makefile
+	reinplace {s| CC2=$(CC2) | CC2="$(CC2)" |g} ${worksrcpath}/makefile
+	reinplace "s|CC= cc|CC= ${configure.cc} [get_canonical_archflags]|g" ${worksrcpath}/makefile
+	reinplace "s|CC2= cc|CC2= ${configure.cc} [get_canonical_archflags]|g" ${worksrcpath}/makefile
 }
 
 pre-destroot { 
-	file mkdir ${destroot}${prefix}/bin
 	file mkdir ${destroot}${prefix}/share/doc/kermit
 }
 
 livecheck.type  regexm
-livecheck.url   http://www.columbia.edu/kermit/ck80.html
-livecheck.regex {<td><b>Version:</b></td>\n<td><b>([0-9\.]+)</b></td>}
+livecheck.regex {<td><b>Version:</b></td>\n<td>([0-9\.]+)</td>}

Modified: trunk/dports/comms/kermit/files/patch-ckuus5.c
===================================================================
--- trunk/dports/comms/kermit/files/patch-ckuus5.c	2011-09-11 16:10:42 UTC (rev 83834)
+++ trunk/dports/comms/kermit/files/patch-ckuus5.c	2011-09-11 16:11:15 UTC (rev 83835)
@@ -1,10 +1,10 @@
---- ckuus5.c.orig	Fri Nov 14 10:20:20 2003
-+++ ckuus5.c	Fri Nov 14 16:06:56 2003
-@@ -814,6 +814,7 @@
+--- ckuus5.c.orig	2011-09-08 08:32:20.000000000 -0500
++++ ckuus5.c	2011-09-08 08:33:05.000000000 -0500
+@@ -840,6 +840,7 @@
  char * k_info_dir = NULL;               /* Where to find text files */
  #ifdef UNIX
  static char * txtdir[] = {
-+    "@@prefix@@/share/kermit"		/* Mac OS X MacPorts*/
++    "@@prefix@@/share/kermit"           /* Mac OS X MacPorts */
      "/usr/local/doc/",                  /* Linux, SunOS, ... */
      "/usr/share/lib/",                  /* HP-UX 10.xx... */
      "/usr/share/doc/",                  /* Other possibilities... */

Modified: trunk/dports/comms/kermit/files/patch-makefile
===================================================================
--- trunk/dports/comms/kermit/files/patch-makefile	2011-09-11 16:10:42 UTC (rev 83834)
+++ trunk/dports/comms/kermit/files/patch-makefile	2011-09-11 16:11:15 UTC (rev 83835)
@@ -1,9 +1,9 @@
---- makefile.orig	2004-04-18 04:52:00.000000000 +1000
-+++ makefile	2008-12-11 09:04:33.000000000 +1100
-@@ -734,10 +734,10 @@
- # . defining the values on the command line
- # . defining the values in the environment and use the -e option
+--- makefile.orig	2011-08-21 10:12:07.000000000 -0500
++++ makefile	2011-09-11 11:01:11.000000000 -0500
+@@ -817,10 +817,10 @@
  #
+ # The following symbols are used to specify library and header file locations:
+ # 
 -prefix  = /usr/local
 +prefix  = @@prefix@@
  srproot = $(prefix)
@@ -13,7 +13,7 @@
  
  K4LIB=-L/usr/kerberos/lib
  K4INC=-I/usr/kerberos/include
-@@ -905,7 +905,7 @@
+@@ -971,7 +971,7 @@
  MANDIR = $(manroot)/man/man1
  MANEXT = 1
  SRCDIR =
@@ -22,86 +22,12 @@
  CERTDIR =
  
  TEXTFILES = COPYING.TXT ckcbwr.txt ckubwr.txt ckuins.txt ckccfg.txt \
-@@ -991,48 +991,27 @@
- 	rm -f $(DESTDIR)$(BINDIR)/kermit;\
+@@ -1073,7 +1073,7 @@
  	cp $(BINARY) $(DESTDIR)$(BINDIR)/kermit || exit 1;\
  	chmod 755    $(DESTDIR)$(BINDIR)/kermit || exit 1;\
--	rm -f        $(DESTDIR)$(BINDIR)/kermit-sshsub;\
+ 	rm -f        $(DESTDIR)$(BINDIR)/kermit-sshsub;\
 -	ln -s        $(DESTDIR)$(BINDIR)/kermit\
--		     $(DESTDIR)$(BINDIR)/kermit-sshsub || exit 1;\
--	echo 'set flag=f\nPrC Removing binaries' >&3;\
--	echo "RmF $(DESTDIR)$(BINDIR)/kermit-sshsub" >&3;\
--	echo "RmF $(DESTDIR)$(BINDIR)/kermit" >&3;\
--	if test -f ckermit.ini; then\
--		echo "#!$(DESTDIR)$(BINDIR)/kermit" >\
--			$(DESTDIR)$(BINDIR)/_tmp.ini;\
--		cat ckermit.ini >> $(DESTDIR)$(BINDIR)/_tmp.ini;\
--		mv $(DESTDIR)$(BINDIR)/_tmp.ini\
--		   $(DESTDIR)$(BINDIR)/ckermit.ini;\
--		chmod 755 $(DESTDIR)$(BINDIR)/ckermit.ini;\
--		echo "RmF $(DESTDIR)$(BINDIR)/ckermit.ini" >&3;\
--	fi;\
--	echo;\
--	echo 'EfM' >&3;\
--	echo "Kermit binary installed:";\
--	ls -l $(DESTDIR)$(BINDIR)/kermit\
--	      $(DESTDIR)$(BINDIR)/kermit-sshsub\
--	      $(DESTDIR)$(BINDIR)/ckermit.ini;\
- 	echo;\
- 	echo " WARNING: If C-Kermit is to be used for dialing out,";\
- 	echo " you must change its owner and group and permissions";\
- 	echo " to match the 'cu' program.  See the ckuins.txt file";\
- 	echo " for details.";\
- 	echo;\
--	echo MANDIR=$(MANDIR);\
--	if test -n "$(MANDIR)"; then\
--		if test -d $(MANDIR); then\
--			echo  "$(MANDIR) exists...";\
-+	echo MANDIR=$(DESTDIR)$(MANDIR);\
-+	if test -n "$(DESTDIR)$(MANDIR)"; then\
-+		if test -d $(DESTDIR)$(MANDIR); then\
-+			echo  "$(DESTDIR)$(MANDIR) exists...";\
- 		else\
--			echo "Creating $(MANDIR)...";\
--			mkdir $(MANDIR) || exit 1;\
--			chmod 755 $(MANDIR) || exit 1;\
-+			echo "Creating $(DESTDIR)$(MANDIR)...";\
-+			mkdir $(DESTDIR)$(MANDIR) || exit 1;\
-+			chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
- 		fi;\
- 		echo "Installing man page...";\
--		rm -f $(MANDIR)/kermit.$(MANEXT);\
--		cp    ckuker.nr $(MANDIR)/kermit.$(MANEXT) || exit 1;\
--		chmod 644       $(MANDIR)/kermit.$(MANEXT) || exit 1;\
-+		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
-+		cp    ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
-+		chmod 644       $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
- 		echo 'set flag=f\nPrC Removing man pages' >&3;\
--		echo "RmF $(MANDIR)/kermit.$(MANEXT)" >&3;\
-+		echo "RmF $(DESTDIR)$(MANDIR)/kermit.$(MANEXT)" >&3;\
- 		echo 'EfM' >&3;\
- 		echo;\
- 	else\
-@@ -1930,8 +1909,8 @@
- macosx102nc:
- 	@echo Making C-Kermit $(CKVER) for `uname -s` + ncurses...
- 	$(MAKE) CC=$(CC) CC2=$(CC2) xermit KTARGET=$${KTARGET:-$(@)} \
--	"CFLAGS= -DMACOSX10 -DCK_NCURSES -DTCPSOCKET -DUSE_STRERROR -O \
--	$(KFLAGS) " "LIBS= -lncurses $(LIBS)"
-+	"CFLAGS+= -DMACOSX10 -DCK_NCURSES -DTCPSOCKET -DUSE_STRERROR -O \
-+	-DLOCK_DIR=\\\"/tmp\\\" $(KFLAGS) " "LIBS= -lncurses $(LIBS)"
- 
- #The problem here is that if curses.h also exists, it conflicts with
- #ncurses.h and and we have fatal errors.  If this happens to you, then
-@@ -1949,9 +1928,9 @@
- macosx103: 
- 	@echo Making C-Kermit $(CKVER) for `uname -s` + ncurses...
- 	$(MAKE) CC=$(CC) CC2=$(CC2) xermit KTARGET=$${KTARGET:-$(@)} \
--	"CFLAGS= -DMACOSX10 -DMACOSX103 -DCK_NCURSES -DTCPSOCKET \
-+	"CFLAGS+= -DMACOSX10 -DMACOSX103 -DCK_NCURSES -DTCPSOCKET \
- 	-DUSE_STRERROR -DUSE_NAMESER_COMPAT -O \
--	$(KFLAGS) " "LIBS= -lncurses -lresolv $(LIBS)"
-+	-DLOCK_DIR=\\\"/tmp\\\" $(KFLAGS) " "LIBS= -lncurses -lresolv $(LIBS)"
- 
- macosx103nc:
- 	$(MAKE) MAKE=$(MAKE) CC=$(CC) CC2=$(CC2) macosx103
++	ln -s        kermit\
+ 		     $(DESTDIR)$(BINDIR)/kermit-sshsub || exit 1;\
+ 	echo 'set flag=f\nPrC Removing binaries' >&3;\
+ 	echo "RmF $(DESTDIR)$(BINDIR)/kermit-sshsub" >&3;\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110911/6089dc3d/attachment-0001.html>


More information about the macports-changes mailing list