From c113d996164d710e95cafbc2771e29c773e91f47 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 1 Sep 2000 09:19:00 +0000 Subject: Update to 0.91.8. Other improvements: - make it USE_LIBTOOL; - sort PLIST; - fix configure's sprintf test segfault. --- x11-toolkits/lesstif/Makefile | 11 +++---- x11-toolkits/lesstif/distinfo | 2 +- x11-toolkits/lesstif/files/patch-ar | 11 +++++++ x11-toolkits/lesstif/pkg-plist | 64 +++++++++++++++++-------------------- 4 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 x11-toolkits/lesstif/files/patch-ar (limited to 'x11-toolkits/lesstif') diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index e340d8c3e5fe..080fd2c09c71 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -6,7 +6,7 @@ # PORTNAME= lesstif -PORTVERSION= 0.91.4 +PORTVERSION= 0.91.8 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \ ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \ @@ -21,7 +21,8 @@ MANUAL_PACKAGE_BUILD= do not want to install during interactive build USE_AUTOCONF= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOLFILES= aclocal.m4 lib/Xbae/aclocal.m4 lib/Xlt/aclocal.m4 test/aclocal.m4 CONFIGURE_ARGS+=--enable-static --enable-shared --disable-build-Xlt \ --enable-production --disable-debug --disable-build-Xbae @@ -72,29 +73,27 @@ post-install: ${RM} -f ${PREFIX}/LessTif/INSTALL ${RM} -rf ${PREFIX}/LessTif/doc ${RM} -f ${PREFIX}/lib/libXm.so.2 + ${RM} -f ${PREFIX}/lib/libXm.la ${RM} -f ${PREFIX}/lib/libMrm.so.2 + ${RM} -f ${PREFIX}/lib/libMrm.la .if defined(MOTIF2) ${LN} -sf ${PREFIX}/LessTif/Motif2.0/include/Xm ${PREFIX}/include ${LN} -sf ${PREFIX}/LessTif/Motif2.0/include/Mrm ${PREFIX}/include ${LN} -sf ${PREFIX}/LessTif/Motif2.0/lib/libXm.so.1 ${PREFIX}/lib/libXm.so.1 ${LN} -sf ${PREFIX}/lib/libXm.so.1 ${PREFIX}/lib/libXm.so ${LN} -sf ${PREFIX}/LessTif/Motif2.0/lib/libXm.a ${PREFIX}/lib/libXm.a - ${LN} -sf ${PREFIX}/LessTif/Motif2.0/lib/libXm.la ${PREFIX}/lib/libXm.la ${LN} -sf ${PREFIX}/LessTif/Motif2.0/lib/libMrm.so.1 ${PREFIX}/lib/libMrm.so.1 ${LN} -sf ${PREFIX}/lib/libMrm.so.1 ${PREFIX}/lib/libMrm.so ${LN} -sf ${PREFIX}/LessTif/Motif2.0/lib/libMrm.a ${PREFIX}/lib/libMrm.a - ${LN} -sf ${PREFIX}/LessTif/Motif2.0/lib/libMrm.la ${PREFIX}/lib/libMrm.la .else ${LN} -sf ${PREFIX}/LessTif/Motif1.2/include/Xm ${PREFIX}/include ${LN} -sf ${PREFIX}/LessTif/Motif1.2/include/Mrm ${PREFIX}/include ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libXm.so.1 ${PREFIX}/lib/libXm.so.1 ${LN} -sf ${PREFIX}/lib/libXm.so.1 ${PREFIX}/lib/libXm.so ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libXm.a ${PREFIX}/lib/libXm.a - ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libXm.la ${PREFIX}/lib/libXm.la ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libMrm.so.1 ${PREFIX}/lib/libMrm.so.1 ${LN} -sf ${PREFIX}/lib/libMrm.so.1 ${PREFIX}/lib/libMrm.so ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libMrm.a ${PREFIX}/lib/libMrm.a - ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libMrm.la ${PREFIX}/lib/libMrm.la .endif @${CAT} ${PKGMESSAGE} diff --git a/x11-toolkits/lesstif/distinfo b/x11-toolkits/lesstif/distinfo index 7d2b93a93d35..59928b782799 100644 --- a/x11-toolkits/lesstif/distinfo +++ b/x11-toolkits/lesstif/distinfo @@ -1 +1 @@ -MD5 (lesstif-0.91.4.tar.gz) = 264ddee653cb7ea7d0bc9ae6e99a9ef7 +MD5 (lesstif-0.91.8.tar.gz) = 4b91059f06b4764d247af4fda968e1cc diff --git a/x11-toolkits/lesstif/files/patch-ar b/x11-toolkits/lesstif/files/patch-ar new file mode 100644 index 000000000000..152230eaac90 --- /dev/null +++ b/x11-toolkits/lesstif/files/patch-ar @@ -0,0 +1,11 @@ +--- aclocal.m4.orig Thu Aug 31 12:06:58 2000 ++++ aclocal.m4 Fri Sep 1 10:42:51 2000 +@@ -283,7 +283,7 @@ + AC_DEFUN(AM_FUNC_VOID_SPRINTF, + [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf, + [AC_TRY_RUN([#include +-int sprintf(); main() { exit(sprintf(".")); }], ++int sprintf(); main() { char c; exit(sprintf(&c, "")); }], + ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)]) + if test $ac_cv_func_void_sprintf = no; then + AC_DEFINE(VOID_SPRINTF,1, diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist index 6faa6fe32041..8ddeef4a6997 100644 --- a/x11-toolkits/lesstif/pkg-plist +++ b/x11-toolkits/lesstif/pkg-plist @@ -5,10 +5,6 @@ LessTif/COPYING.LIB LessTif/CREDITS LessTif/FAQ LessTif/KNOWN_BUGS -LessTif/NEWS -LessTif/README -LessTif/RELEASE-POLICY -LessTif/release-notes.txt LessTif/Motif1.2/include/Mrm/MrmAppl.h LessTif/Motif1.2/include/Mrm/MrmDecls.h LessTif/Motif1.2/include/Mrm/MrmPrivate.h @@ -133,11 +129,9 @@ LessTif/Motif1.2/include/Xm/XmP.h LessTif/Motif1.2/include/Xm/XmStrDefs.h LessTif/Motif1.2/include/Xm/XmosP.h LessTif/Motif1.2/lib/libMrm.a -LessTif/Motif1.2/lib/libMrm.la LessTif/Motif1.2/lib/libMrm.so LessTif/Motif1.2/lib/libMrm.so.1 LessTif/Motif1.2/lib/libXm.a -LessTif/Motif1.2/lib/libXm.la LessTif/Motif1.2/lib/libXm.so LessTif/Motif1.2/lib/libXm.so.1 LessTif/Motif2.0/include/Mrm/MrmAppl.h @@ -155,6 +149,7 @@ LessTif/Motif2.0/include/Xm/BaseClassP.h LessTif/Motif2.0/include/Xm/BulletinB.h LessTif/Motif2.0/include/Xm/BulletinBP.h LessTif/Motif2.0/include/Xm/CSText.h +LessTif/Motif2.0/include/Xm/CSTextP.h LessTif/Motif2.0/include/Xm/CacheP.h LessTif/Motif2.0/include/Xm/CareVisualT.h LessTif/Motif2.0/include/Xm/CascadeB.h @@ -292,45 +287,46 @@ LessTif/Motif2.0/include/Xm/XmAll.h LessTif/Motif2.0/include/Xm/XmP.h LessTif/Motif2.0/include/Xm/XmStrDefs.h LessTif/Motif2.0/include/Xm/XmosP.h +LessTif/Motif2.0/include/Xm/Xpm.h +LessTif/Motif2.0/include/Xm/XpmP.h LessTif/Motif2.0/lib/libMrm.a -LessTif/Motif2.0/lib/libMrm.la LessTif/Motif2.0/lib/libMrm.so LessTif/Motif2.0/lib/libMrm.so.2 LessTif/Motif2.0/lib/libXm.a -LessTif/Motif2.0/lib/libXm.la LessTif/Motif2.0/lib/libXm.so LessTif/Motif2.0/lib/libXm.so.2 -@dirrm LessTif/Motif1.2/include/Mrm -@dirrm LessTif/Motif1.2/include/Xm -@dirrm LessTif/Motif1.2/include -@dirrm LessTif/Motif1.2/lib -@dirrm LessTif/Motif1.2 -@dirrm LessTif/Motif2.0/include/Mrm -@dirrm LessTif/Motif2.0/include/Xm -@dirrm LessTif/Motif2.0/include -@dirrm LessTif/Motif2.0/lib -@dirrm LessTif/Motif2.0 -@dirrm LessTif +LessTif/NEWS +LessTif/README +LessTif/RELEASE-POLICY +LessTif/release-notes.txt bin/mwm -bin/uil bin/mxmkmf +bin/uil bin/xmbind -include/Mrm -include/Xm -lib/libXm.a -lib/libXm.so -lib/libXm.so.1 -lib/libXm.la -lib/libMrm.a -lib/libMrm.so -lib/libMrm.so.1 -lib/libMrm.la lib/X11/app-defaults/Mwm -@comment lib/X11/config/Imake.tmpl <-- needs additional consideration, as it -@comment tends to broke Imake included with XFree4.0!!! -lib/X11/config/Motif.rules -lib/X11/config/Motif.tmpl +lib/X11/config/LessTif.rules +lib/X11/config/LessTif.tmpl +lib/X11/config/host.def lib/X11/mwm/README lib/X11/mwm/alt.map lib/X11/mwm/system.mwmrc +lib/libMrm.a +lib/libMrm.so +lib/libMrm.so.1 +lib/libXm.a +lib/libXm.so +lib/libXm.so.1 @dirrm lib/X11/mwm +@dirrm LessTif/Motif2.0/lib +@dirrm LessTif/Motif2.0/include/Xm +@dirrm LessTif/Motif2.0/include/Mrm +@dirrm LessTif/Motif2.0/include +@dirrm LessTif/Motif2.0 +@dirrm LessTif/Motif1.2/lib +@dirrm LessTif/Motif1.2/include/Xm +@dirrm LessTif/Motif1.2/include/Mrm +@dirrm LessTif/Motif1.2/include +@dirrm LessTif/Motif1.2 +@dirrm LessTif +include/Mrm +include/Xm -- cgit v1.2.3