Index: Mk/Uses/libtool.mk =================================================================== --- Mk/Uses/libtool.mk (revision 369938) +++ Mk/Uses/libtool.mk (working copy) @@ -19,6 +19,8 @@ _USES_POST+= libtool .if ${libtool_ARGS:Mbuild} BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool +CONFIGURE_ENV+= LTTRAP=no +MAKE_ENV+= LTTRAP=no .endif .endif @@ -40,7 +42,9 @@ patch-libtool: @${FIND} ${WRKDIR} -type f -name ltmain.sh | \ ${XARGS} ${REINPLACE_CMD} \ -e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\ + -e '/if.*prog.*linkmode.*relink !=.*mode/s/if.*;/if :;/'\ -e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/' \ + -e '/if.*prog.*linkmode.*relink = .*mode/s/||.*;/;/' \ -e 's/|-p|-pg|/|-B*|-p|-pg|/' .if ! ${libtool_ARGS:Moldver} Index: archivers/tardy/Makefile =================================================================== --- archivers/tardy/Makefile (revision 369938) +++ archivers/tardy/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= tardy PORTVERSION= 1.28 DISTVERSIONSUFFIX= .D001.orig -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= SF/tardy/${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX} Index: audio/libnoise/Makefile =================================================================== --- audio/libnoise/Makefile (revision 369938) +++ audio/libnoise/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libnoise DISTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION} DISTNAME= ${PORTNAME}src-${DISTVERSION} @@ -26,7 +26,7 @@ post-patch: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib - (cd ${WRKSRC}/src && ${LOCALBASE}/bin/libtool --mode=install \ + (cd ${WRKSRC}/src && ${SETENV} LTTRAP=no ${LOCALBASE}/bin/libtool --mode=install \ ${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib) (cd ${WRKSRC}/include && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise) Index: audio/libnoise/pkg-plist =================================================================== --- audio/libnoise/pkg-plist (revision 369938) +++ audio/libnoise/pkg-plist (working copy) @@ -45,6 +45,7 @@ include/noise/vectortable.h lib/libnoise.a lib/libnoise.so lib/libnoise.so.0 +lib/libnoise.so.0.0.0 @dirrm include/noise/model @dirrm include/noise/module @dirrm include/noise Index: devel/bglibs/Makefile =================================================================== --- devel/bglibs/Makefile (revision 369938) +++ devel/bglibs/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= bglibs PORTVERSION= 1.106 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://untroubled.org/${PORTNAME}/archive/ \ Index: devel/bglibs/pkg-plist =================================================================== --- devel/bglibs/pkg-plist (revision 369938) +++ devel/bglibs/pkg-plist (working copy) @@ -100,11 +100,13 @@ lib/bglibs/libbg-path.a lib/bglibs/libbg-str.a lib/bglibs/libbg-sysdeps.a lib/bglibs/libbg-sysdeps.so -lib/bglibs/libbg-sysdeps.so.2 +lib/bglibs/libbg-sysdeps.so.1 +lib/bglibs/libbg-sysdeps.so.1.1.1 lib/bglibs/libbg-unix.a lib/bglibs/libbg.a lib/bglibs/libbg.so -lib/bglibs/libbg.so.2 +lib/bglibs/libbg.so.1 +lib/bglibs/libbg.so.1.1.1 lib/bglibs/libinstaller.a lib/bglibs/libinstcheck.a lib/bglibs/libinstshow.a Index: devel/cdialog/Makefile =================================================================== --- devel/cdialog/Makefile (revision 369938) +++ devel/cdialog/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= cdialog PORTVERSION= 1.2.20140219 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S|^c||}/ Index: devel/cdialog/pkg-plist =================================================================== --- devel/cdialog/pkg-plist (revision 369938) +++ devel/cdialog/pkg-plist (working copy) @@ -7,6 +7,7 @@ include/cdialog/dlg_keys.h lib/libcdialog.a lib/libcdialog.so lib/libcdialog.so.11 +lib/libcdialog.so.11.1.0 man/man1/cdialog.1.gz man/man3/cdialog.3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README Index: devel/fhist/Makefile =================================================================== --- devel/fhist/Makefile (revision 369938) +++ devel/fhist/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= fhist PORTVERSION= 1.21 DISTVERSIONSUFFIX= .D001 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} Index: devel/libdsp/Makefile =================================================================== --- devel/libdsp/Makefile (revision 369938) +++ devel/libdsp/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libdsp PORTVERSION= 5.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \ http://mirror.mcx2.org/ Index: devel/libdsp/pkg-plist =================================================================== --- devel/libdsp/pkg-plist (revision 369938) +++ devel/libdsp/pkg-plist (working copy) @@ -27,5 +27,6 @@ include/dsp/dspop.h include/dsp/dsptypes.h lib/libdsp.a lib/libdsp.so -lib/libdsp.so.10 +lib/libdsp.so.2 +lib/libdsp.so.2.8.1 @dirrm include/dsp Index: devel/libexplain/Makefile =================================================================== --- devel/libexplain/Makefile (revision 369938) +++ devel/libexplain/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libexplain PORTVERSION= 1.3.${PATCHLEVEL} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R} DISTNAME= ${PORTNAME}-${PORTVERSION:R} Index: devel/libexplain/pkg-plist =================================================================== --- devel/libexplain/pkg-plist (revision 369938) +++ devel/libexplain/pkg-plist (working copy) @@ -240,7 +240,8 @@ include/libexplain/write.h include/libexplain/writev.h lib/libexplain.a lib/libexplain.so -lib/libexplain.so.55 +lib/libexplain.so.51 +lib/libexplain.so.51.4.0 libdata/pkgconfig/libexplain.pc man/man1/explain.1.gz man/man1/explain_lca2010.1.gz Index: devel/liblangtag/Makefile =================================================================== --- devel/liblangtag/Makefile (revision 369938) +++ devel/liblangtag/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_COMB= dual LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtoolize USE_LDCONFIG= yes USES= gmake iconv libtool pathfix pkgconfig tar:bzip2 INSTALL_TARGET= install-strip Index: devel/liblangtag/files/patch-configure =================================================================== --- devel/liblangtag/files/patch-configure (revision 0) +++ devel/liblangtag/files/patch-configure (working copy) @@ -0,0 +1,15 @@ +--- configure.orig 2014-05-21 03:36:23 UTC ++++ configure +@@ -14651,11 +14651,7 @@ MODULE_LIBS= + if test "x$enable_modules" != "xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5 + $as_echo_n "checking for the suffix of module shared libraries... " >&6; } +- export SED +- shrext_cmds=`libtool --config | grep '^shrext_cmds='` +- eval $shrext_cmds +- module=yes eval std_shrext=$shrext_cmds +- lt_module_suffix=`echo $std_shrext | sed 's/^\.//'` ++ lt_module_suffix=so + { $as_echo "$as_me:${as_lineno-$LINENO}: result: .$lt_module_suffix" >&5 + $as_echo ".$lt_module_suffix" >&6; } + if test "x$lt_module_suffix" = x; then Property changes on: devel/liblangtag/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libltdl/Makefile =================================================================== --- devel/libltdl/Makefile (revision 369938) +++ devel/libltdl/Makefile (working copy) @@ -2,21 +2,20 @@ # $FreeBSD$ PORTNAME= libltdl -MASTERDIR= ${.CURDIR}/../../devel/libtool +PORTREVISION= 0 COMMENT= System independent dlopen wrapper +.include "${.CURDIR}/../libtool/Makefile.common" + LICENSE= LGPL21 -USE_LDCONFIG= yes -USES= libtool:keepla -CONFIGURE_ARGS= --enable-ltdl-install +LICENSE_FILE= ${WRKSRC}/COPYING.LIB -CONFIGURE_WRKSRC=${WRKSRC}/libltdl -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist -INFO= # empty +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-ltdl-install INSTALL_TARGET= install-strip +USES+= libtool:keepla # .la file used in ltdl.m4 +USE_LDCONFIG= yes +WRKSRC_SUBDIR= libltdl -.include "${MASTERDIR}/Makefile" +.include Index: devel/libltdl/pkg-plist =================================================================== --- devel/libltdl/pkg-plist (revision 369938) +++ devel/libltdl/pkg-plist (working copy) @@ -6,5 +6,4 @@ lib/libltdl.a lib/libltdl.la lib/libltdl.so lib/libltdl.so.7 -lib/libltdl.so.7.3.0 -@dirrm include/libltdl +lib/libltdl.so.7.3.1 Index: devel/libmaa/Makefile =================================================================== --- devel/libmaa/Makefile (revision 369938) +++ devel/libmaa/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libmaa PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -27,7 +27,8 @@ DOCS= README doc/libmaa.600dpi.ps PLIST_FILES= include/maa.h \ lib/libmaa.a \ lib/libmaa.so \ - lib/libmaa.so.3 + lib/libmaa.so.3 \ + lib/libmaa.so.3.0.0 PORTDOCS= ${DOCS:T} post-install: Index: devel/libtool/Makefile =================================================================== --- devel/libtool/Makefile (revision 369938) +++ devel/libtool/Makefile (working copy) @@ -1,36 +1,35 @@ # Created by: Motoyuki Kasahara # $FreeBSD$ -PORTNAME?= libtool -PORTVERSION= 2.4.2 -PORTREVISION= 3 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= libtool -DISTNAME= libtool-${PORTVERSION} +PORTNAME= libtool +PORTREVISION= 0 -MAINTAINER= autotools@FreeBSD.org -COMMENT?= Generic shared library support script +COMMENT= Generic shared library support script -LICENSE?= GPLv2 +.include "${.CURDIR}/../libtool/Makefile.common" -CONFLICTS= libtool-fixed-[0-9]* +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USES+= makeinfo GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --disable-ltdl-install -CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" -INFO?= libtool +CONFIGURE_ARGS= --disable-ltdl-install +MAKE_ARGS= MAKEINFOFLAGS=--no-split +USES+= makeinfo -post-extract: - @${RM} -f ${WRKSRC}/doc/*.info* +INFO= libtool post-patch: - @${REINPLACE_CMD} -e 's|sed gsed|sed|g' \ - -e 's|CC=cc|CC=${CC}|g' \ - ${WRKSRC}/configure ${WRKSRC}/libltdl/configure + @${RM} -f ${WRKSRC}/doc/*.info* +.for f in build-aux/ltmain.sh configure libtoolize.in m4/libtool.m4 + @${TOUCH} -mr ${WRKSRC}/${f}.orig ${WRKSRC}/${f} +.endfor -post-configure: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f +post-install: + ${SED} -i '' \ + '2s/^/[ x$$LTTRAP = xno ] || { echo "Caught one!"; exit 1; }/' \ + ${STAGEDIR}${PREFIX}/bin/libtool .include Index: devel/libtool/Makefile.common =================================================================== --- devel/libtool/Makefile.common (revision 0) +++ devel/libtool/Makefile.common (working copy) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTVERSION= 2.4.2.418 +PORTREVISION?= 0 # Leave this zero. Set in Makefile instead. +CATEGORIES= devel +MASTER_SITES= GNU_ALPHA +DISTNAME= libtool-${PORTVERSION} + +MAINTAINER= autotools@FreeBSD.org + +DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo +USES= tar:xz Property changes on: devel/libtool/Makefile.common ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: devel/libtool/distinfo =================================================================== --- devel/libtool/distinfo (revision 369938) +++ devel/libtool/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libtool-2.4.2.tar.gz) = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918 -SIZE (libtool-2.4.2.tar.gz) = 2632347 +SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c +SIZE (libtool-2.4.2.418.tar.xz) = 941808 Index: devel/libtool/files/patch-build-aux_ltmain.sh =================================================================== --- devel/libtool/files/patch-build-aux_ltmain.sh (revision 0) +++ devel/libtool/files/patch-build-aux_ltmain.sh (working copy) @@ -0,0 +1,30 @@ +--- build-aux/ltmain.sh.orig 2013-10-26 22:53:58 UTC ++++ build-aux/ltmain.sh +@@ -8598,13 +8598,13 @@ func_mode_link () + # + case $version_type in + # correct linux to gnu/linux during the next big refactor +- darwin|linux|osf|windows|none) ++ darwin|freebsd-elf|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age=$number_minor + revision=$number_revision + ;; +- freebsd-aout|freebsd-elf|qnx|sunos) ++ freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 +@@ -8690,8 +8690,9 @@ func_mode_link () + ;; + + freebsd-elf) +- major=.$current +- versuffix=.$current ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix=$major.$age.$revision + ;; + + irix | nonstopux) Property changes on: devel/libtool/files/patch-build-aux_ltmain.sh ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: devel/libtool/files/patch-configure =================================================================== --- devel/libtool/files/patch-configure (revision 0) +++ devel/libtool/files/patch-configure (working copy) @@ -0,0 +1,42 @@ +--- configure.orig 2013-10-26 22:53:35 UTC ++++ configure +@@ -11582,7 +11582,8 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -16739,7 +16740,8 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -19695,7 +19697,8 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -22786,7 +22789,8 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; Property changes on: devel/libtool/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libtool/files/patch-libltdl-Makefile.in =================================================================== --- devel/libtool/files/patch-libltdl-Makefile.in (revision 369938) +++ devel/libtool/files/patch-libltdl-Makefile.in (working copy) @@ -1,23 +0,0 @@ ---- libltdl/Makefile.in.orig 2009-11-19 14:55:46.000000000 +0100 -+++ libltdl/Makefile.in 2009-11-19 14:56:35.000000000 +0100 -@@ -402,12 +402,6 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - --$(top_srcdir)/configure: $(am__configure_deps) -- $(am__cd) $(srcdir) && $(AUTOCONF) --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) --$(am__aclocal_m4_deps): -- - config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ -@@ -418,7 +412,6 @@ - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h - $(srcdir)/config-h.in: $(am__configure_deps) -- ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - Index: devel/libtool/files/patch-libltdl_config_ltmain.sh =================================================================== --- devel/libtool/files/patch-libltdl_config_ltmain.sh (revision 369938) +++ devel/libtool/files/patch-libltdl_config_ltmain.sh (working copy) @@ -1,83 +0,0 @@ ---- libltdl/config/ltmain.sh.orig 2010-09-22 09:45:43.000000000 -0500 -+++ libltdl/config/ltmain.sh 2011-01-18 12:59:46.000000000 -0600 -@@ -1376,2 +1376,17 @@ - $opt_debug -+ -+ # FreeBSD-specific: where we install compilers with non-standard names -+ tag_compilers_CC="*cc cc* *gcc gcc* clang*" -+ tag_compilers_CXX="*c++ c++* *g++ g++* clang++*" -+ base_compiler=`set -- "$@"; echo $1` -+ -+ # If $tagname isn't set, then try to infer if the default "CC" tag applies -+ if test -z "$tagname"; then -+ for zp in $tag_compilers_CC; do -+ case $base_compiler in -+ $zp) tagname="CC"; break;; -+ esac -+ done -+ fi -+ - if test -n "$available_tags" && test -z "$tagname"; then -@@ -1412,3 +1427,18 @@ - esac -- fi -+ -+ # FreeBSD-specific: try compilers based on inferred tag -+ if test -z "$tagname"; then -+ eval "tag_compilers=\$tag_compilers_${z}" -+ if test -n "$tag_compilers"; then -+ for zp in $tag_compilers; do -+ case $base_compiler in -+ $zp) tagname=$z; break;; -+ esac -+ done -+ if test -n "$tagname"; then -+ break -+ fi -+ fi -+ fi -+ fi - done -@@ -3516,2 +3546,5 @@ - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) -@@ -5585,2 +5618,3 @@ - esac -+ deplibs="$deplibs $arg" - continue -@@ -6155,9 +6189,26 @@ - func_append compiler_flags " $deplib" -- if test "$linkmode" = lib ; then -- case "$new_inherited_linker_flags " in -- *" $deplib "*) ;; -- * ) func_append new_inherited_linker_flags " $deplib" ;; -- esac -- fi - fi -+ -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ ;; -+ *) -+ ;; -+ esac # linkmode -+ - continue Index: devel/libtool/files/patch-libtoolize.in =================================================================== --- devel/libtool/files/patch-libtoolize.in (revision 0) +++ devel/libtool/files/patch-libtoolize.in (working copy) @@ -0,0 +1,34 @@ +--- libtoolize.in.orig 2013-08-23 05:06:01 UTC ++++ libtoolize.in +@@ -393,7 +393,7 @@ func_copy () + # Filters always take priority. + if test -n "$my_filter"; then + if $opt_dry_run || { +- ( umask 0 ++ ( + $SED -e "$my_filter" "$my_srcfile" > "$my_destfile" + ) >/dev/null 2>&1 + } +@@ -423,7 +423,7 @@ func_copy () + $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir" + + if $opt_dry_run || { +- ( umask 0 ++ ( + $my_copycmd "$my_srcfile" "$my_destfile" + ) >/dev/null 2>&1 + } +@@ -1894,9 +1894,10 @@ func_require_seen_libtool () + # Lists of all files libtoolize has ever installed. These are removed + # before installing the latest files when --force was passed to help + # ensure a clean upgrade. +- # Do not remove config.guess nor config.sub, we don't install them +- # without --install, and the project may not be using Automake. +- all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h" ++ # Do not remove config.guess, config.sub or install-sh, we don't ++ # install them without --install, and the project may not be using ++ # Automake. ++ all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h" + all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4" + all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c" + Property changes on: devel/libtool/files/patch-libtoolize.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libtool/files/patch-m4_libtool.m4 =================================================================== --- devel/libtool/files/patch-m4_libtool.m4 (revision 0) +++ devel/libtool/files/patch-m4_libtool.m4 (working copy) @@ -0,0 +1,12 @@ +--- m4/libtool.m4.orig 2013-10-25 23:37:46 UTC ++++ m4/libtool.m4 +@@ -2547,7 +2547,8 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; Property changes on: devel/libtool/files/patch-m4_libtool.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libtool/pkg-plist =================================================================== --- devel/libtool/pkg-plist (revision 369938) +++ devel/libtool/pkg-plist (working copy) @@ -9,50 +9,45 @@ share/aclocal/ltoptions.m4 share/aclocal/ltsugar.m4 share/aclocal/ltversion.m4 share/aclocal/lt~obsolete.m4 -share/libtool/config/compile -share/libtool/config/config.guess -share/libtool/config/config.sub -share/libtool/config/depcomp -share/libtool/config/install-sh -share/libtool/config/ltmain.sh -share/libtool/config/missing -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/Makefile.inc -share/libtool/libltdl/README -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/argz.c -share/libtool/libltdl/argz_.h -share/libtool/libltdl/config-h.in -share/libtool/libltdl/configure -share/libtool/libltdl/configure.ac -share/libtool/libltdl/libltdl/lt__alloc.h -share/libtool/libltdl/libltdl/lt__dirent.h -share/libtool/libltdl/libltdl/lt__glibc.h -share/libtool/libltdl/libltdl/lt__private.h -share/libtool/libltdl/libltdl/lt__strl.h -share/libtool/libltdl/libltdl/lt_dlloader.h -share/libtool/libltdl/libltdl/lt_error.h -share/libtool/libltdl/libltdl/lt_system.h -share/libtool/libltdl/libltdl/slist.h -share/libtool/libltdl/loaders/dld_link.c -share/libtool/libltdl/loaders/dlopen.c -share/libtool/libltdl/loaders/dyld.c -share/libtool/libltdl/loaders/load_add_on.c -share/libtool/libltdl/loaders/loadlibrary.c -share/libtool/libltdl/loaders/preopen.c -share/libtool/libltdl/loaders/shl_load.c -share/libtool/libltdl/lt__alloc.c -share/libtool/libltdl/lt__dirent.c -share/libtool/libltdl/lt__strl.c -share/libtool/libltdl/lt_dlloader.c -share/libtool/libltdl/lt_error.c -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/slist.c -@dirrm share/libtool/libltdl/loaders -@dirrm share/libtool/libltdl/libltdl -@dirrm share/libtool/libltdl -@dirrm share/libtool/config -@dirrm share/libtool +%%DATADIR%%/COPYING.LIB +%%DATADIR%%/Makefile.am +%%DATADIR%%/Makefile.in +%%DATADIR%%/README +%%DATADIR%%/aclocal.m4 +%%DATADIR%%/argz.c +%%DATADIR%%/argz_.h +%%DATADIR%%/build-aux/compile +%%DATADIR%%/build-aux/config.guess +%%DATADIR%%/build-aux/config.sub +%%DATADIR%%/build-aux/depcomp +%%DATADIR%%/build-aux/install-sh +%%DATADIR%%/build-aux/ltmain.sh +%%DATADIR%%/build-aux/missing +%%DATADIR%%/config-h.in +%%DATADIR%%/configure +%%DATADIR%%/configure.ac +%%DATADIR%%/libltdl/lt__alloc.h +%%DATADIR%%/libltdl/lt__dirent.h +%%DATADIR%%/libltdl/lt__glibc.h +%%DATADIR%%/libltdl/lt__private.h +%%DATADIR%%/libltdl/lt__strl.h +%%DATADIR%%/libltdl/lt_dlloader.h +%%DATADIR%%/libltdl/lt_error.h +%%DATADIR%%/libltdl/lt_system.h +%%DATADIR%%/libltdl/slist.h +%%DATADIR%%/loaders/dld_link.c +%%DATADIR%%/loaders/dlopen.c +%%DATADIR%%/loaders/dyld.c +%%DATADIR%%/loaders/load_add_on.c +%%DATADIR%%/loaders/loadlibrary.c +%%DATADIR%%/loaders/preopen.c +%%DATADIR%%/loaders/shl_load.c +%%DATADIR%%/lt__alloc.c +%%DATADIR%%/lt__dirent.c +%%DATADIR%%/lt__strl.c +%%DATADIR%%/lt_dlloader.c +%%DATADIR%%/lt_error.c +%%DATADIR%%/ltdl.c +%%DATADIR%%/ltdl.h +%%DATADIR%%/ltdl.mk +%%DATADIR%%/slist.c Index: devel/srecord/Makefile =================================================================== --- devel/srecord/Makefile (revision 369938) +++ devel/srecord/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= srecord PORTVERSION= 1.64 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF Index: devel/srecord/pkg-plist =================================================================== --- devel/srecord/pkg-plist (revision 369938) +++ devel/srecord/pkg-plist (working copy) @@ -143,6 +143,7 @@ include/srecord/string.h lib/libsrecord.a lib/libsrecord.so lib/libsrecord.so.0 +lib/libsrecord.so.0.0.0 libdata/pkgconfig/srecord.pc man/man1/srec_cat.1.gz man/man1/srec_cmp.1.gz Index: devel/xparam/Makefile =================================================================== --- devel/xparam/Makefile (revision 369938) +++ devel/xparam/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= xparam PORTVERSION= 1.22 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SF Index: devel/xparam/pkg-plist =================================================================== --- devel/xparam/pkg-plist (revision 369938) +++ devel/xparam/pkg-plist (working copy) @@ -84,4 +84,4 @@ include/xparam_extend.h lib/libxparam.a lib/libxparam.so lib/libxparam.so.1 -@dirrm include/xparam +lib/libxparam.so.1.0.0 Index: dns/dnsutl/Makefile =================================================================== --- dns/dnsutl/Makefile (revision 369938) +++ dns/dnsutl/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= dnsutl PORTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} Index: dns/ldns/Makefile =================================================================== --- dns/ldns/Makefile (revision 369938) +++ dns/ldns/Makefile (working copy) @@ -14,8 +14,8 @@ COMMENT= Library for programs conforming LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +GNU_CONFIGURE= yes USES= gmake libtool -USE_AUTOTOOLS= libtoolize USE_OPENSSL= yes USE_LDCONFIG= yes @@ -108,15 +108,18 @@ CONFIGURE_ARGS+= --enable-rrtype-ta .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL)) post-configure: +# ac_cv_prog_libtool=../libtool => Always use bundled libtool .if ${PORT_OPTIONS:MEXAMPLES} @(cd ${WRKSRC}/examples; ./configure --prefix=${PREFIX} \ --infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man \ - --build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2}) + --build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2} \ + ac_cv_prog_libtool=../libtool) .endif .if ${PORT_OPTIONS:MDRILL} @(cd ${WRKSRC}/drill; ./configure --prefix=${PREFIX} \ --mandir=${MANPREFIX}/man \ - --build=${CONFIGURE_TARGET}) + --build=${CONFIGURE_TARGET} \ + ac_cv_prog_libtool=../libtool) .endif post-build: Index: ftp/twoftpd/Makefile =================================================================== --- ftp/twoftpd/Makefile (revision 369938) +++ ftp/twoftpd/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= twoftpd PORTVERSION= 1.42 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= http://untroubled.org/${PORTNAME}/ Index: games/gnubg/Makefile =================================================================== --- games/gnubg/Makefile (revision 369938) +++ games/gnubg/Makefile (working copy) @@ -28,7 +28,6 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip USES= gmake libtool pathfix shebangfix python pkgconfig compiler:c++11-lang -USE_AUTOTOOLS= aclocal automake libtoolize USE_GNOME= glib20 OPTIONS_DEFINE= NLS DOCS @@ -38,7 +37,4 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -#pre-configure: -# cd ${WRKSRC} && ./autogen.sh - .include Index: graphics/gexiv2/Makefile =================================================================== --- graphics/gexiv2/Makefile (revision 369938) +++ graphics/gexiv2/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= gexiv2 PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://yorba.org/download/${PORTNAME}/${PORTVERSION:R}/ DISTNAME= lib${PORTNAME}_${PORTVERSION} Index: graphics/gexiv2/pkg-plist =================================================================== --- graphics/gexiv2/pkg-plist (revision 369938) +++ graphics/gexiv2/pkg-plist (working copy) @@ -5,11 +5,9 @@ include/gexiv2/gexiv2-managed-stream.h include/gexiv2/gexiv2-preview-properties.h include/gexiv2/gexiv2-preview-image.h include/gexiv2/gexiv2-startup.h -lib/libgexiv2.so.2 -lib/libgexiv2.so lib/libgexiv2.a +lib/libgexiv2.so +lib/libgexiv2.so.2 +lib/libgexiv2.so.2.0.0 libdata/pkgconfig/gexiv2.pc share/vala/vapi/gexiv2.vapi -@dirrmtry include/gexiv2 -@dirrmtry share/vala/vapi -@dirrmtry share/vala Index: lang/gforth/Makefile =================================================================== --- lang/gforth/Makefile (revision 369938) +++ lang/gforth/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= gforth PORTVERSION= 0.7.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.complang.tuwien.ac.at/forth/gforth/ \ GNU Index: lang/gforth/pkg-plist =================================================================== --- lang/gforth/pkg-plist (revision 369938) +++ lang/gforth/pkg-plist (working copy) @@ -12,18 +12,22 @@ include/gforth/%%PORTVERSION%%/config.h include/gforth/%%PORTVERSION%%/libcc.h lib/gforth/%%PORTVERSION%%/gforth-ditc lib/gforth/%%PORTVERSION%%/gforth.fi -lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0 -lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so lib/gforth/%%PORTVERSION%%/libcc-named/cstr.a -lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0 -lib/gforth/%%PORTVERSION%%/libcc-named/socket.so +lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so +lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0 +lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0.0.0 lib/gforth/%%PORTVERSION%%/libcc-named/socket.a -lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0 -lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so +lib/gforth/%%PORTVERSION%%/libcc-named/socket.so +lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0 +lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0.0.0 lib/gforth/%%PORTVERSION%%/libcc-named/libffi.a -lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0 -lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so +lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so +lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0 +lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0.0.0 lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a +lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so +lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0 +lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0.0.0 man/man1/gforth.1.gz %%DATADIR%%/%%PORTVERSION%%/TAGS %%DATADIR%%/%%PORTVERSION%%/add.fs Index: lang/oo2c/Makefile =================================================================== --- lang/oo2c/Makefile (revision 369938) +++ lang/oo2c/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= oo2c PORTVERSION= 2.1.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= SF/ooc/ooc2/${PORTVERSION} DISTNAME= ${PORTNAME}_${BITS}-${PORTVERSION} Index: lang/oo2c/pkg-plist =================================================================== --- lang/oo2c/pkg-plist (revision 369938) +++ lang/oo2c/pkg-plist (working copy) @@ -10,6 +10,7 @@ man/man1/oowhereis.1.gz lib/liboo2c.a lib/liboo2c.so lib/liboo2c.so.3 +lib/liboo2c.so.3.0.0 lib/oo2c/emacs/o2-default.el lib/oo2c/emacs/o2-indent.el lib/oo2c/emacs/o2-insert.el Index: mail/mailfront/Makefile =================================================================== --- mail/mailfront/Makefile (revision 369938) +++ mail/mailfront/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= mailfront PORTVERSION= 2.01 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/${PORTNAME}/ \ http://untroubled.org/${PORTNAME}/archive/ Index: mail/qmail-autoresponder/Makefile =================================================================== --- mail/qmail-autoresponder/Makefile (revision 369938) +++ mail/qmail-autoresponder/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= qmail-autoresponder PORTVERSION= 0.97 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://untroubled.org/${PORTNAME}/ Index: mail/qmail-qfilter/Makefile =================================================================== --- mail/qmail-qfilter/Makefile (revision 369938) +++ mail/qmail-qfilter/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= qmail-qfilter PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://untroubled.org/${PORTNAME}/ Index: math/libtommath/Makefile =================================================================== --- math/libtommath/Makefile (revision 369938) +++ math/libtommath/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= libtommath PORTVERSION= 0.42.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://libtom.org/files/ DISTNAME= ltm-${PORTVERSION} @@ -31,7 +31,7 @@ post-patch: .if ${PORT_OPTIONS:MSHARED} USES+= libtool:build USE_LDCONFIG= yes -PLIST_FILES+= lib/libtommath.so.0 lib/libtommath.so +PLIST_FILES+= lib/libtommath.so lib/libtommath.so.0 lib/libtommath.so.0.0.41 MAKEFILE= makefile.shared .else MAKEFILE= makefile Index: net/ntop/Makefile =================================================================== --- net/ntop/Makefile (revision 369938) +++ net/ntop/Makefile (working copy) @@ -22,8 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ DBDIR?= /var/db -USES= gmake libtool python -USE_AUTOTOOLS= automake autoconf libtoolize +USES= autoreconf:build gmake libtool python USE_GNOME= libxml2 USE_OPENSSL= yes GNU_CONFIGURE= yes @@ -36,9 +35,8 @@ CONFIGURE_ARGS= --localstatedir=${DBDIR} --with-zlib-root=/usr INSTALL_TARGET= install-strip -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-deinstall SUB_LIST= DBDIR=${DBDIR} @@ -91,7 +89,7 @@ CONFIGURE_ARGS+= STRIP=${LOCALBASE}/bin/ .endif pre-configure: - @cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} autogen.sh --noconfig + @(cd ${WRKSRC} && ${SETENV} LTTRAP=no ./autogen.sh --noconfig) pre-install: @cd ${WRKSRC} && ${MAKE_CMD} dnetter Index: security/cvm/Makefile =================================================================== --- security/cvm/Makefile (revision 369938) +++ security/cvm/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= cvm PORTVERSION= 0.96 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://untroubled.org/${PORTNAME}/ \ http://untroubled.org/${PORTNAME}/archive/ Index: security/cvm/pkg-plist =================================================================== --- security/cvm/pkg-plist (revision 369938) +++ security/cvm/pkg-plist (working copy) @@ -26,31 +26,40 @@ lib/libcvm-client.a lib/libcvm-client.so lib/libcvm-command.a lib/libcvm-command.so -lib/libcvm-command.so.2 +lib/libcvm-command.so.1 +lib/libcvm-command.so.1.1.0 lib/libcvm-local.a lib/libcvm-local.so -lib/libcvm-local.so.2 +lib/libcvm-local.so.1 +lib/libcvm-local.so.1.1.0 lib/libcvm-module.a lib/libcvm-module.so -lib/libcvm-module.so.2 +lib/libcvm-module.so.1 +lib/libcvm-module.so.1.1.0 lib/libcvm-qmail.a lib/libcvm-qmail.so -lib/libcvm-qmail.so.2 +lib/libcvm-qmail.so.1 +lib/libcvm-qmail.so.1.1.0 lib/libcvm-sasl.a lib/libcvm-sasl.so -lib/libcvm-sasl.so.2 +lib/libcvm-sasl.so.1 +lib/libcvm-sasl.so.1.1.0 lib/libcvm-sql.a lib/libcvm-sql.so -lib/libcvm-sql.so.2 +lib/libcvm-sql.so.1 +lib/libcvm-sql.so.1.1.0 lib/libcvm-udp.a lib/libcvm-udp.so -lib/libcvm-udp.so.2 +lib/libcvm-udp.so.1 +lib/libcvm-udp.so.1.1.0 lib/libcvm-v1client.a lib/libcvm-v1client.so -lib/libcvm-v1client.so.2 +lib/libcvm-v1client.so.1 +lib/libcvm-v1client.so.1.1.0 lib/libcvm-v2client.a lib/libcvm-v2client.so -lib/libcvm-v2client.so.2 +lib/libcvm-v2client.so.1 +lib/libcvm-v2client.so.1.1.0 %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO @@ -77,5 +86,3 @@ lib/libcvm-v2client.so.2 %%PORTDOCS%%%%DOCSDIR%%/sql.html %%PORTDOCS%%%%DOCSDIR%%/v1client.html %%PORTDOCS%%%%DOCSDIR%%/v2client.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm include/cvm Index: security/libtomcrypt/Makefile =================================================================== --- security/libtomcrypt/Makefile (revision 369938) +++ security/libtomcrypt/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libtomcrypt PORTVERSION= 1.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://libtom.org/files/ DISTNAME= crypt-${PORTVERSION} Index: security/libtomcrypt/pkg-plist =================================================================== --- security/libtomcrypt/pkg-plist (revision 369938) +++ security/libtomcrypt/pkg-plist (working copy) @@ -15,9 +15,11 @@ include/tomcrypt_test.h lib/libtomcrypt.a lib/libtomcrypt.so lib/libtomcrypt.so.0 +lib/libtomcrypt.so.0.0.117 lib/libtomcrypt_prof.a lib/libtomcrypt_prof.so lib/libtomcrypt_prof.so.0 +lib/libtomcrypt_prof.so.0.0.117 %%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% Index: sysutils/ucspi-proxy/Makefile =================================================================== --- sysutils/ucspi-proxy/Makefile (revision 369938) +++ sysutils/ucspi-proxy/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= ucspi-proxy PORTVERSION= 0.98 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://untroubled.org/ucspi-proxy/ Index: sysutils/vii/Makefile =================================================================== --- sysutils/vii/Makefile (revision 369938) +++ sysutils/vii/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= vii PORTVERSION= 4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://vii.sourceforge.net/ \ CRITICAL Index: x11/roxterm/Makefile =================================================================== --- x11/roxterm/Makefile (revision 369938) +++ x11/roxterm/Makefile (working copy) @@ -48,7 +48,7 @@ do-configure: ${PYTHON_CMD} mscript.py configure) do-build: - @(cd ${WRKSRC} && ${PYTHON_CMD} mscript.py build) + @(cd ${WRKSRC} && ${SETENV} LTTRAP=no ${PYTHON_CMD} mscript.py build) do-install: .for i in roxterm roxterm-config Index: x11-toolkits/xmhtml/Makefile =================================================================== --- x11-toolkits/xmhtml/Makefile (revision 369938) +++ x11-toolkits/xmhtml/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= XmHTML PORTVERSION= 1.1.9 +PORTREVISION= 1 CATEGORIES= x11-toolkits www MASTER_SITES= SF/${PORTNAME:tl} @@ -24,7 +25,7 @@ MAKE_ENV= LIBTOOL=${LIBTOOL} OPTIONS_DEFINE= DOCS EXAMPLES do-install: - (cd ${WRKSRC}/lib && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ + (cd ${WRKSRC}/lib && ${SETENV} LTTRAP=no ${LIBTOOL} --mode=install ${INSTALL_DATA} \ libXmHTML.la ${STAGEDIR}${PREFIX}/lib) @${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML (cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \ Index: x11-toolkits/xmhtml/pkg-plist =================================================================== --- x11-toolkits/xmhtml/pkg-plist (revision 369938) +++ x11-toolkits/xmhtml/pkg-plist (working copy) @@ -14,6 +14,7 @@ include/XmHTML/toolkit.h lib/libXmHTML.a lib/libXmHTML.so lib/libXmHTML.so.1 +lib/libXmHTML.so.1.0.2 %%PORTDOCS%%%%DOCSDIR%%/GPL.html %%PORTDOCS%%%%DOCSDIR%%/LGPL.html %%PORTDOCS%%%%DOCSDIR%%/XmHTML.html