[76374] trunk/dports/x11/kxterm

21 Feb 2011

Revision: 76374
          http://trac.macports.org/changeset/76374
Author:   jmr@macports.org
Date:     2011-02-21 08:46:15 -0800 (Mon, 21 Feb 2011)
Log Message:
-----------
kxterm: add missing deps (#28490), fix build (#28491), use notes

Modified Paths:
--------------
    trunk/dports/x11/kxterm/Portfile
    trunk/dports/x11/kxterm/files/patch-cxterm_Imakefile.diff

Added Paths:
-----------
    trunk/dports/x11/kxterm/files/patch-cxterm_HZtable.h.diff
    trunk/dports/x11/kxterm/files/patch-utils_hzimctrl.c.diff

Modified: trunk/dports/x11/kxterm/Portfile
===================================================================

--- trunk/dports/x11/kxterm/Portfile	2011-02-21 16:38:51 UTC (rev 76373)
+++ trunk/dports/x11/kxterm/Portfile	2011-02-21 16:46:15 UTC (rev 76374)
@@ -1,9 +1,10 @@
 # $Id$
 
 PortSystem			1.0
+
 name				kxterm
 version				5.0pl3
-revision			1
+revision			2
 categories			x11 chinese
 maintainers			nomaintainer
 description			Chinese-capable xterm with dictionary-lookup capability
@@ -29,10 +30,13 @@
 
 checksums			md5 ece6a83c1fe1c3451e3667f51c77b2ec
 
-universal_variant no
+depends_build			port:mkfontdir port:bdftopcf
+depends_lib			port:xorg-libXaw
+
 use_xmkmf yes
 
-patchfiles			patch-cxterm_misc.c.diff patch-CXterm.ad.diff
+patchfiles			patch-cxterm_misc.c.diff patch-CXterm.ad.diff \
+				patch-cxterm_HZtable.h.diff patch-utils_hzimctrl.c.diff
 
 configure {
 	system "cd ${worksrcpath} && xmkmf"
@@ -47,10 +51,6 @@
 					INSTALLFLAGS="-c" INSTUIDFLAGS=""
 
 post-destroot {
-	# Move executables to proper MP location
-	xinstall -m 755 -d ${destroot}${prefix}/bin
-	eval file rename [glob ${destroot}/usr/X11R6/bin/*] \
-		${destroot}${prefix}/bin
 	# Docs
 	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} README.kxterm \
@@ -96,24 +96,22 @@
 		${destroot}${prefix}/bin/CXterm.sh"
 }
 
-post-install {
-	ui_msg "Three lines need to be added to your .xinitrc file (and to others"
-	ui_msg "who wish to use kxterm):"
-	ui_msg ""
-	ui_msg "xrdb -merge ${prefix}/share/${name}/CXterm.ad"
-	ui_msg "xset fp+ ${prefix}/share/${name}/fonts"
-	ui_msg "xset fp rehash"
-	ui_msg ""
-	ui_msg "Be sure to have a look at "
-	ui_msg "${prefix}/share/doc/${name}/README if the basic configuration"
-	ui_msg "as set by the MacPorts install does not do enough for you"
-	ui_msg "(cxterm and cxtermb5 are both installed, for GB and Big5 use,"
-	ui_msg "respectively)."
-	ui_msg "${prefix}/share/doc/${name}/MacPorts_ReadMe.txt also"
-	ui_msg "contains this information."
-}
+notes "
+Three lines need to be added to your .xinitrc file (and to others
+who wish to use kxterm):
 
+xrdb -merge ${prefix}/share/${name}/CXterm.ad
+xset fp+ ${prefix}/share/${name}/fonts
+xset fp rehash
+
+Be sure to have a look at
+${prefix}/share/doc/${name}/README if the basic configuration
+as set by the MacPorts install does not do enough for you
+(cxterm and cxtermb5 are both installed, for GB and Big5 use,
+respectively).
+${prefix}/share/doc/${name}/MacPorts_ReadMe.txt also
+contains this information."
+
 platform darwin {
 	patchfiles-append	patch-cxterm_Imakefile.diff
 }
-

Added: trunk/dports/x11/kxterm/files/patch-cxterm_HZtable.h.diff
===================================================================
--- trunk/dports/x11/kxterm/files/patch-cxterm_HZtable.h.diff	                        (rev 0)
+++ trunk/dports/x11/kxterm/files/patch-cxterm_HZtable.h.diff	2011-02-21 16:46:15 UTC (rev 76374)
@@ -0,0 +1,11 @@
+--- cxterm/HZtable.h.orig	1995-01-17 21:57:26.000000000 +1100
++++ cxterm/HZtable.h	2011-02-22 03:05:01.000000000 +1100
+@@ -50,7 +50,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE
+  * To advoid including the tremendous amount of X11 include files,
+  * this definition is simply copied here.
+  */
+-#ifndef	_XLIB_H_
++#ifndef	_X11_XLIB_H_
+ typedef struct {		/* normal 16 bit characters are two bytes */
+     unsigned char byte1;
+     unsigned char byte2;

Modified: trunk/dports/x11/kxterm/files/patch-cxterm_Imakefile.diff
===================================================================
--- trunk/dports/x11/kxterm/files/patch-cxterm_Imakefile.diff	2011-02-21 16:38:51 UTC (rev 76373)
+++ trunk/dports/x11/kxterm/files/patch-cxterm_Imakefile.diff	2011-02-21 16:46:15 UTC (rev 76374)
@@ -5,7 +5,7 @@
  #endif
  
 -        DEFINES = -DKXTERM -DHANZI $(X_COMPATIBLE_FLAGS)
-+        DEFINES = -DKXTERM -DHANZI -DHAVE_SYS_ERR $(X_COMPATIBLE_FLAGS)
++        DEFINES = -DKXTERM -DHANZI -DHAVE_SYS_ERR -DUSE_SYSV_PGRP $(X_COMPATIBLE_FLAGS)
  
   OSMAJORVERSION = OSMajorVersion
   OSMINORVERSION = OSMinorVersion

Added: trunk/dports/x11/kxterm/files/patch-utils_hzimctrl.c.diff
===================================================================
--- trunk/dports/x11/kxterm/files/patch-utils_hzimctrl.c.diff	                        (rev 0)
+++ trunk/dports/x11/kxterm/files/patch-utils_hzimctrl.c.diff	2011-02-21 16:46:15 UTC (rev 76374)
@@ -0,0 +1,28 @@
+--- utils/hzimctrl.c.orig	1995-01-17 21:59:17.000000000 +1100
++++ utils/hzimctrl.c	2011-02-22 03:28:43.000000000 +1100
+@@ -112,6 +112,8 @@ char *setdirs = "\033]160;%s\007";	/* es
+ char *setim = "\033]161;%s\007";	/* esc seq for set hz input method */
+ char *setparam = "\033]162;%s\007";	/* esc seq for set input param */
+ 
++static void Usage(void);
++
+ /*
+    set input method 
+  */
+@@ -130,7 +132,6 @@ main (argc, argv)
+ #ifdef CANT_OPEN_DEV_TTY
+ 	extern char *ttyname();
+ #endif
+-	static void Usage();
+ 
+ 	ptr = strrchr(myname = argv[0], '/');
+ 	if (ptr)
+@@ -215,7 +216,7 @@ main (argc, argv)
+ 	exit(0);
+ }
+ 
+-static void Usage()
++static void Usage(void)
+ {
+ 	fprintf(stderr,"Usage: %s [ -m input_method | -d HZINPUTDIR | -p parameters ]\n",
+ 		myname);

    

jmr＠macports.org

tags

participants (1)