diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 5b6dd7ad9eec..ff0f7c864c34 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -6,27 +6,32 @@ # PORTNAME= xdeview -PORTVERSION= 0.5.13 -CATEGORIES= converters tk82 -MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \ - http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/ +PORTVERSION= 0.5.18 +CATEGORIES= converters tk83 +MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/ DISTNAME= uudeview-${PORTVERSION} MAINTAINER= hoek@FreeBSD.org -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - uu.1:${PORTSDIR}/converters/uulib +LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib \ + tk83.1:${PORTSDIR}/x11-toolkits/tk83 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-tcl="${PREFIX}" --enable-tk="${PREFIX}" -# Season to taste --- anything over tcl7.5 -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2" +# Explicitly disable Tcl otherwise the configure script picks-up +# crud from the $PATH lie /usr/opt/Simili/tcl/. +CONFIGURE_ARGS= --disable-tcl --disable-tk +# Season to taste --- anything better or equal to tcl8.0 is probably okay +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \ + -lX11 -ltcl83 -ltk83 -lm" \ + CPPFLAGS="-I${LOCALBASE}/include/tcl8.3 -DHAVE_TCL \ + -I${LOCALBASE}/include/tk8.3 -DHAVE_TK \ + -I${X11BASE}/include" ALL_TARGET= xdeview INSTALL_TARGET= install-tcl MAN1= xdeview.1 -DOCFILES= ${FILESDIR}/porting.notes ${WRKSRC}/HOWTO +DOCFILES= ${FILESDIR}/porting.notes post-install: strip ${PREFIX}/bin/uuwish diff --git a/converters/xdeview/distinfo b/converters/xdeview/distinfo index bd0259d935c4..a4f77652cbb9 100644 --- a/converters/xdeview/distinfo +++ b/converters/xdeview/distinfo @@ -1,2 +1 @@ -MD5 (uudeview-0.5.13.tar.gz) = fda32e2de4a6b92eb56f1e286ae3815a -MD5 (uudeview-0.5.13.tar.gz) = dddf4c01973307c7d203f55c5e0c7fc3 +MD5 (uudeview-0.5.18.tar.gz) = f852ab1a77e946dc7522df06b0c59e35 diff --git a/converters/xdeview/files/patch-aa b/converters/xdeview/files/patch-aa index 99062a06bd52..cc5839b6b958 100644 --- a/converters/xdeview/files/patch-aa +++ b/converters/xdeview/files/patch-aa @@ -1,74 +1,5 @@ --- configure.orig Thu Jan 9 08:22:00 1997 +++ configure Thu Nov 4 11:29:23 1999 -@@ -2193,7 +2193,7 @@ - - if test "$have_tk" = "yes" ; then - echo $ac_n "checking for -ltk$tk_major.$tk_minor""... $ac_c" 1>&6 --ac_lib_var=`echo tk$tk_major.$tk_minor'_'Tk_Main | tr './+\055' '__p_'` -+ac_lib_var=`echo tk$tk_major.$tk_minor'_'Tk_MainEx | tr './+\055' '__p_'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2205,11 +2205,11 @@ - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char Tk_Main(); -+char Tk_MainEx(); - - int main() { return 0; } - int t() { --Tk_Main() -+Tk_MainEx() - ; return 0; } - EOF - if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -@@ -2233,7 +2233,7 @@ - - if test "$have_tk_lib" = "no" ; then - echo $ac_n "checking for -ltk$tk_major$tk_minor""... $ac_c" 1>&6 --ac_lib_var=`echo tk$tk_major$tk_minor'_'Tk_Main | tr './+\055' '__p_'` -+ac_lib_var=`echo tk$tk_major$tk_minor'_'Tk_MainEx | tr './+\055' '__p_'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2245,11 +2245,11 @@ - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char Tk_Main(); -+char Tk_MainEx(); - - int main() { return 0; } - int t() { --Tk_Main() -+Tk_MainEx() - ; return 0; } - EOF - if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -@@ -2274,7 +2274,7 @@ - fi - if test "$have_tk_lib" = "no" ; then - echo $ac_n "checking for -ltk""... $ac_c" 1>&6 --ac_lib_var=`echo tk'_'Tk_Main | tr './+\055' '__p_'` -+ac_lib_var=`echo tk'_'Tk_MainEx | tr './+\055' '__p_'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2286,11 +2286,11 @@ - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char Tk_Main(); -+char Tk_MainEx(); - - int main() { return 0; } - int t() { --Tk_Main() -+Tk_MainEx() - ; return 0; } - EOF - if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then @@ -3148,7 +3148,7 @@ fi diff --git a/converters/xdeview/files/porting.notes b/converters/xdeview/files/porting.notes index eb15b92e9768..29ea9b46fe31 100644 --- a/converters/xdeview/files/porting.notes +++ b/converters/xdeview/files/porting.notes @@ -1,5 +1,5 @@ This was originally one distribution for UUdeview, but I have broken -it up into ``libuu', ``uudeview'', and ``xdeview'', hopefully making +it up into ``uulib', ``uudeview'', and ``xdeview'', hopefully making it cleaner and more useful. The source itself is quite portable and required no patching, although diff --git a/converters/xdeview/pkg-comment b/converters/xdeview/pkg-comment index 8829dca8c963..5946f58b8d2c 100644 --- a/converters/xdeview/pkg-comment +++ b/converters/xdeview/pkg-comment @@ -1 +1 @@ -An X11 program for uu/xx/Base64/BinHex de-/encoding +An X11 program for uu/xx/Base64/BinHex/yEnc de-/encoding diff --git a/converters/xdeview/pkg-descr b/converters/xdeview/pkg-descr index 3524953f2318..488111cf02d2 100644 --- a/converters/xdeview/pkg-descr +++ b/converters/xdeview/pkg-descr @@ -1,8 +1,8 @@ This is a powerful and easy-to-use tcl/tk-based program -which can decode BinHex, uuencoded, xxencoded, and Base64 -formats, and encode in all of those except for BinHex. +which can de/en-code BinHex, uuencoded, xxencoded, Base64, +and yEnc formats. -Xdeview uses tcl/tk 8.0, but the port can be configured to +Xdeview uses tcl/tk 8.3, but the port can be configured to use other tcl/tk versions (see the port Makefile). -WWW: http://www.uni-frankfurt.de/~fp/uudeview/ +WWW: http://www.fpx.de/fp/Software/UUDeview/ diff --git a/converters/xdeview/pkg-plist b/converters/xdeview/pkg-plist index 1a4ce0342f6b..1aeedf24fa32 100644 --- a/converters/xdeview/pkg-plist +++ b/converters/xdeview/pkg-plist @@ -1,5 +1,4 @@ bin/uuwish bin/xdeview -%%PORTDOCS%%share/doc/xdeview/HOWTO %%PORTDOCS%%share/doc/xdeview/porting.notes %%PORTDOCS%%@dirrm share/doc/xdeview