diff options
73 files changed, 176 insertions, 199 deletions
diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile index 3c6e39eead88..cc35f40599d0 100644 --- a/hebrew/he2/Makefile +++ b/hebrew/he2/Makefile @@ -18,7 +18,7 @@ COMMENT= An editor for editing (primarily LaTeX) Hebrew files RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 post-install: @${CAT} ${PKGMESSAGE} diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile index 89411ed576d9..c24da35eb50c 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -21,7 +21,7 @@ ALL_TARGET= includes all INSTALL_TARGET= install install.man GNU_CONFIGURE= yes USE_AUTOCONF_VER= 213 -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 MAKE_ARGS= CDEBUGFLAGS="${CFLAGS}" INSTALLS_SHLIB= yes USE_BZIP2= yes diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist index 7692b881600c..6dd7181fb7ed 100644 --- a/japanese/FreeWnn-lib/pkg-plist +++ b/japanese/FreeWnn-lib/pkg-plist @@ -73,11 +73,9 @@ lib/wnn/lt_LN/uumkey lib/wnn/lt_LN/uumkey_e lib/wnn/lt_LN/uumrc lib/libjd.a -lib/libjd.la lib/libjd.so lib/libjd.so.0 lib/libwnn.a -lib/libwnn.la lib/libwnn.so lib/libwnn.so.0 @dirrm lib/wnn/ja_JP/rk diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile index 09a5c86dca66..e09cdeaa0d52 100644 --- a/japanese/ipadic/Makefile +++ b/japanese/ipadic/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= chasen:${PORTSDIR}/japanese/chasen-base GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-dicdir=${PREFIX}/share/chasen/dic -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 post-install: ${INSTALL_DATA} ${WRKSRC}/chasenrc \ diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile index 2117a804c722..398af93b0904 100644 --- a/japanese/libicq/Makefile +++ b/japanese/libicq/Makefile @@ -22,7 +22,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library to add ICQ communication support to your software USE_GNOME= glib12 -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes INSTALLS_SHLIB= yes +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/lang/cim/Makefile b/lang/cim/Makefile index 568068cfbdf5..661625478c4f 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -13,8 +13,13 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/cim/ MAINTAINER= ports@FreeBSD.org COMMENT= Compiler for the SIMULA programming language -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes INSTALLS_SHLIB= yes MAN1= cim.1 +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 07f2f2a605ad..b7139f3e8d15 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -9,7 +9,7 @@ PORTNAME= elk PORTVERSION= 3.99.6 PORTREVISION= 2 CATEGORIES= lang scheme -MASTER_SITES= http://sam.zoy.org/projects/elk/ +MASTER_SITES= http://sam.zoy.org/elk/ MAINTAINER= ports@FreeBSD.org COMMENT= An embeddable Scheme interpreter @@ -19,7 +19,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \ USE_BZIP2= yes USE_MOTIF= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 LIBTOOLFLAGS= # none CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/lang/elk/pkg-plist b/lang/elk/pkg-plist index 339f4dc06606..46a8899e998c 100644 --- a/lang/elk/pkg-plist +++ b/lang/elk/pkg-plist @@ -18,42 +18,26 @@ include/elk/scheme.h include/elk/site.h include/elk/stkmem.h include/elk/type.h -lib/elk/bitstring.la lib/elk/bitstring.so -lib/elk/debug.la lib/elk/debug.so -lib/elk/elk-eval.la lib/elk/elk-eval.so -lib/elk/gdbm.la lib/elk/gdbm.so -lib/elk/hack.la lib/elk/hack.so -lib/elk/motif.la lib/elk/motif.so -lib/elk/newhandler.la lib/elk/newhandler.so -lib/elk/record.la lib/elk/record.so -lib/elk/regexp.la lib/elk/regexp.so -lib/elk/struct.la lib/elk/struct.so -lib/elk/unix.la lib/elk/unix.so -lib/elk/xaw.la lib/elk/xaw.so -lib/elk/xlib.la lib/elk/xlib.so lib/libelk-xlib.a -lib/libelk-xlib.la lib/libelk-xlib.so lib/libelk-xlib.so.0 lib/libelk-xt.a -lib/libelk-xt.la lib/libelk-xt.so lib/libelk-xt.so.0 lib/libelk.a -lib/libelk.la lib/libelk.so lib/libelk.so.0 share/elk/apropos.scm diff --git a/lang/libjit/Makefile b/lang/libjit/Makefile index 9f22c353b032..cdb93ef3d586 100644 --- a/lang/libjit/Makefile +++ b/lang/libjit/Makefile @@ -14,8 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Libjit implements Just-In-Time compilation functionality USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -29,6 +30,8 @@ BROKEN= "Segfault during build" .endif post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .if ${OSVERSION} >= 502128 @${REINPLACE_CMD} -e 's|#undef HAVE_TGMATH_H||' \ ${WRKSRC}/config.h.in diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile index 17ec79a9845f..d3f6ba6e1d84 100644 --- a/lang/libutils/Makefile +++ b/lang/libutils/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Support lib for Tensile/NSL USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= CFLAGS="${CFLAGS}" INSTALLS_SHLIB= yes diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile index 5c5defc17e98..a3987b1782fa 100644 --- a/lang/pfe-devel/Makefile +++ b/lang/pfe-devel/Makefile @@ -16,10 +16,10 @@ COMMENT= Implementation of ANSI Forth LATEST_LINK= pfe-devel -USE_PERL5_BUILD= yes +USE_PERL5_BUILD=yes USE_GNOME= gnometarget lthack USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 LIBTOOLFILES= pfe/configure LIBTOOLFLAGS= # none CONFIGURE_ARGS= --mandir=${PREFIX}/man diff --git a/lang/pfe-devel/pkg-plist b/lang/pfe-devel/pkg-plist index 177af6b4a10d..0387c7b43add 100644 --- a/lang/pfe-devel/pkg-plist +++ b/lang/pfe-devel/pkg-plist @@ -77,31 +77,20 @@ include/pfe/version-sub.h include/pfe/your-ext.h include/pfe-config.h include/pfe-target.h +lib/libpfe-0.so lib/libpfe-0.so.32 lib/libpfe.a -lib/libpfe.la lib/libpfe.so -lib/pfe/dstrings.la lib/pfe/dstrings.so -lib/pfe/edit.la lib/pfe/edit.so -lib/pfe/floating.la lib/pfe/floating.so -lib/pfe/fpnostack.la lib/pfe/fpnostack.so -lib/pfe/gforth.la lib/pfe/gforth.so -lib/pfe/help.la lib/pfe/help.so -lib/pfe/module.la lib/pfe/module.so -lib/pfe/smart-go.la lib/pfe/smart-go.so -lib/pfe/struct.la lib/pfe/struct.so -lib/pfe/toolbelt.la lib/pfe/toolbelt.so -lib/pfe/zchar.la lib/pfe/zchar.so %%DATADIR%%/lib/arrays.4th %%DATADIR%%/lib/defer-is.4th diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile index 5c5defc17e98..a3987b1782fa 100644 --- a/lang/pfe/Makefile +++ b/lang/pfe/Makefile @@ -16,10 +16,10 @@ COMMENT= Implementation of ANSI Forth LATEST_LINK= pfe-devel -USE_PERL5_BUILD= yes +USE_PERL5_BUILD=yes USE_GNOME= gnometarget lthack USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 LIBTOOLFILES= pfe/configure LIBTOOLFLAGS= # none CONFIGURE_ARGS= --mandir=${PREFIX}/man diff --git a/lang/pfe/pkg-plist b/lang/pfe/pkg-plist index 177af6b4a10d..0387c7b43add 100644 --- a/lang/pfe/pkg-plist +++ b/lang/pfe/pkg-plist @@ -77,31 +77,20 @@ include/pfe/version-sub.h include/pfe/your-ext.h include/pfe-config.h include/pfe-target.h +lib/libpfe-0.so lib/libpfe-0.so.32 lib/libpfe.a -lib/libpfe.la lib/libpfe.so -lib/pfe/dstrings.la lib/pfe/dstrings.so -lib/pfe/edit.la lib/pfe/edit.so -lib/pfe/floating.la lib/pfe/floating.so -lib/pfe/fpnostack.la lib/pfe/fpnostack.so -lib/pfe/gforth.la lib/pfe/gforth.so -lib/pfe/help.la lib/pfe/help.so -lib/pfe/module.la lib/pfe/module.so -lib/pfe/smart-go.la lib/pfe/smart-go.so -lib/pfe/struct.la lib/pfe/struct.so -lib/pfe/toolbelt.la lib/pfe/toolbelt.so -lib/pfe/zchar.la lib/pfe/zchar.so %%DATADIR%%/lib/arrays.4th %%DATADIR%%/lib/defer-is.4th diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile index 88de77a6b788..52f62731e2cd 100644 --- a/lang/pnetlib/Makefile +++ b/lang/pnetlib/Makefile @@ -22,7 +22,8 @@ BUILD_DEPENDS= cscc:${PORTSDIR}/lang/pnet-base \ USE_XLIB= yes .endif -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes USE_GMAKE= yes PORTDOCS= ChangeLog-1 ChangeLog-2 ChangeLog-3 ChangeLog-4 \ @@ -36,6 +37,10 @@ PORTDOCS= ChangeLog-1 ChangeLog-2 ChangeLog-3 ChangeLog-4 \ IGNORE= Coredump during build on alpha .endif +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/lang/pnetlib/pkg-plist b/lang/pnetlib/pkg-plist index f936f7684348..616ae1981c32 100644 --- a/lang/pnetlib/pkg-plist +++ b/lang/pnetlib/pkg-plist @@ -121,7 +121,6 @@ lib/cscc/lib/de/mscorlib.resources.dll lib/cscc/lib/ilinstall.exe lib/cscc/lib/jsrun.exe lib/cscc/lib/libXsharpSupport.a -lib/cscc/lib/libXsharpSupport.la lib/cscc/lib/libXsharpSupport.so lib/cscc/lib/libXsharpSupport.so.0 lib/cscc/lib/mscorlib.dll diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile index 01d70d37fb84..d8be849ba0fc 100644 --- a/lang/tensile/Makefile +++ b/lang/tensile/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= utils.1:${PORTSDIR}/lang/libutils USE_LIBLTDL= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 LIBTOOLFLAGS= # none CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/lang/tensile/pkg-plist b/lang/tensile/pkg-plist index 662cdab30d64..ddbd8727d5e4 100644 --- a/lang/tensile/pkg-plist +++ b/lang/tensile/pkg-plist @@ -2,11 +2,9 @@ bin/docstrip bin/sl bin/sla lib/libtenpdt.a -lib/libtenpdt.la lib/libtenpdt.so lib/libtenpdt.so.0 lib/libtensile.a -lib/libtensile.la lib/libtensile.so lib/libtensile.so.0 lib/nsl/automata/arith.aut @@ -27,31 +25,22 @@ lib/nsl/automata/urlencode.aut lib/nsl/automata/utf8.aut lib/nsl/automata/whole.aut lib/nsl/module.map -lib/nsl/modules/crypt.la lib/nsl/modules/crypt.scm lib/nsl/modules/crypt.so -lib/nsl/modules/files.la lib/nsl/modules/files.scm lib/nsl/modules/files.so -lib/nsl/modules/fpmath.la lib/nsl/modules/fpmath.scm lib/nsl/modules/fpmath.so -lib/nsl/modules/int64.la lib/nsl/modules/int64.scm lib/nsl/modules/int64.so -lib/nsl/modules/ncurses.la lib/nsl/modules/ncurses.scm lib/nsl/modules/ncurses.so -lib/nsl/modules/rand.la lib/nsl/modules/rand.scm lib/nsl/modules/rand.so -lib/nsl/modules/readline.la lib/nsl/modules/readline.scm lib/nsl/modules/readline.so -lib/nsl/modules/sockets.la lib/nsl/modules/sockets.scm lib/nsl/modules/sockets.so -lib/nsl/modules/time.la lib/nsl/modules/time.scm lib/nsl/modules/time.so lib/nsl/preload.scm diff --git a/mail/crashecho/Makefile b/mail/crashecho/Makefile index dd6b32bbdf88..fd2dc7f23d7f 100644 --- a/mail/crashecho/Makefile +++ b/mail/crashecho/Makefile @@ -18,7 +18,7 @@ COMMENT= An FTN JAM and *.MSG tosser LIB_DEPENDS= jam.2:${PORTSDIR}/mail/jamlib -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= crashecho.1 \ diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile index a06fec781a31..8a0356fb17b3 100644 --- a/mail/jamlib/Makefile +++ b/mail/jamlib/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A JAM subroutine library CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER= 15 NO_INSTALL_MANPAGES= yes INSTALLS_SHLIB= yes diff --git a/mail/jamlib/pkg-plist b/mail/jamlib/pkg-plist index 94b7c85d7622..8a0cf2f72057 100644 --- a/mail/jamlib/pkg-plist +++ b/mail/jamlib/pkg-plist @@ -1,6 +1,5 @@ include/jamlib/jam.h lib/libjam.so.2 lib/libjam.so -lib/libjam.la lib/libjam.a @dirrm include/jamlib diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile index a85e9e16531d..f139b70d6664 100644 --- a/mail/libnewmail/Makefile +++ b/mail/libnewmail/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gnutls.12:${PORTSDIR}/security/gnutls \ USE_LIBLTDL= yes GNU_CONFIGURE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/libnewmail/pkg-plist b/mail/libnewmail/pkg-plist index 401a71e1a5f1..272a22260d84 100644 --- a/mail/libnewmail/pkg-plist +++ b/mail/libnewmail/pkg-plist @@ -8,16 +8,12 @@ include/libnewmail/util.h lib/libnewmail.a lib/libnewmail.so lib/libnewmail.so.0 -lib/libnewmail/libimap.a lib/libnewmail/libimap.so lib/libnewmail/libimap.so.0 -lib/libnewmail/libmaildir.a lib/libnewmail/libmaildir.so lib/libnewmail/libmaildir.so.0 -lib/libnewmail/libpop3.a lib/libnewmail/libpop3.so lib/libnewmail/libpop3.so.0 -lib/libnewmail/libunix.a lib/libnewmail/libunix.so lib/libnewmail/libunix.so.0 %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile index 50576ead9700..17e776a78567 100644 --- a/mail/pop3lite/Makefile +++ b/mail/pop3lite/Makefile @@ -17,7 +17,7 @@ COMMENT= A flexible, modular RFC-compliant POP3 daemon USE_GNOME= glib12 USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes MAN5= pop3lite.conf.5 diff --git a/mail/pop3lite/pkg-plist b/mail/pop3lite/pkg-plist index ac03f2dcc683..e41caecab3bc 100644 --- a/mail/pop3lite/pkg-plist +++ b/mail/pop3lite/pkg-plist @@ -6,31 +6,18 @@ include/pop3lite/userconf.h @unexec install-info --delete %D/info/pop3lite-admin.info %D/info/dir info/pop3lite-admin.info @exec install-info %D/info/pop3lite-admin.info %D/info/dir -lib/pop3lite/alias.la lib/pop3lite/alias.so -lib/pop3lite/apop.la lib/pop3lite/apop.so -lib/pop3lite/capa.la lib/pop3lite/capa.so -lib/pop3lite/connectlog.la lib/pop3lite/connectlog.so -lib/pop3lite/disable.la lib/pop3lite/disable.so -lib/pop3lite/expire.la lib/pop3lite/expire.so -lib/pop3lite/filelog.la lib/pop3lite/filelog.so -lib/pop3lite/homebox.la lib/pop3lite/homebox.so -lib/pop3lite/iplog.la lib/pop3lite/iplog.so -lib/pop3lite/pam.la lib/pop3lite/pam.so -lib/pop3lite/sabotage.la lib/pop3lite/sabotage.so -lib/pop3lite/userconf.la lib/pop3lite/userconf.so -lib/pop3lite/vhost.la lib/pop3lite/vhost.so sbin/pop3lite share/doc/pop3lite/AUTHORS diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile index fd4d196b1897..a0e889195875 100644 --- a/mail/stuphead/Makefile +++ b/mail/stuphead/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --enable-threads \ --prefix=${PREFIX} @@ -59,9 +59,9 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/ispell-ru:${PORTSDIR}/russian/rus-ispell .endif pre-patch: - @${REINPLACE_CMD} -e 's#DATADIRNAME=lib#DATADIRNAME=share#g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's#/usr/bin/gnome-config#$(PREFIX)/bin/gnome-config#g' \ + @${REINPLACE_CMD} -e 's#DATADIRNAME=lib#DATADIRNAME=share#g ; \ + s#/usr/bin/gnome-config#$(PREFIX)/bin/gnome-config#g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure do-install: diff --git a/math/cln/Makefile b/math/cln/Makefile index d44cb78ce2e9..af6533dc642a 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GCC= 3.4 USE_GNOME= gnomehack gnometarget lthack pkgconfig USE_GMAKE= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${MANPREFIX}/man \ --with-gmp diff --git a/math/libneural/Makefile b/math/libneural/Makefile index 13a688f9586b..b908b9dc5b71 100644 --- a/math/libneural/Makefile +++ b/math/libneural/Makefile @@ -13,7 +13,12 @@ MASTER_SITES= http://ieee.uow.edu.au/documents/contrib/ MAINTAINER= ports@FreeBSD.org COMMENT= C++ implementation of the classic 3-layer perceptron in library form -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes +USE_REINPLACE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/math/qhull/Makefile b/math/qhull/Makefile index b369c957dbb2..412c21823b08 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -16,7 +16,7 @@ COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces USE_REINPLACE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(NOPORTDOCS) diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile index b369c957dbb2..412c21823b08 100644 --- a/math/qhull5/Makefile +++ b/math/qhull5/Makefile @@ -16,7 +16,7 @@ COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces USE_REINPLACE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(NOPORTDOCS) diff --git a/math/spar/Makefile b/math/spar/Makefile index 84fd25edb93b..2be020fabb59 100644 --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -15,14 +15,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A modular math parser -USE_GETOPT_LONG= yes +USE_GETOPT_LONG=yes USE_REINPLACE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes MAN1= spar.1 post-patch: - @${REINPLACE_CMD} -e "s,-ldl,,g" ${WRKSRC}/lib/Makefile.in + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s,-ldl,,g" \ + ${WRKSRC}/lib/Makefile.in ${WRKSRC}/lib/module/Makefile.in .include <bsd.port.mk> diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile index e71ecd33f385..cb071ec2fdbd 100644 --- a/misc/demoniac/Makefile +++ b/misc/demoniac/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea USE_REINPLACE= yes USE_GL= yes USE_GNOME= gtk12 -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile index cc6327e7715b..954c11a86170 100644 --- a/misc/misterproper/Makefile +++ b/misc/misterproper/Makefile @@ -19,7 +19,7 @@ COMMENT= A GNOME application designed to manage cyclic tasks USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix gnometarget USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile index 8ed3d9f26251..7bb83a0493d2 100644 --- a/misc/pybliographer/Makefile +++ b/misc/pybliographer/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki USE_GNOME= glib12 gnomehack gnomeprefix USE_PYTHON= yes USE_X_PREFIX= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ @@ -33,12 +33,9 @@ CONFIGURE_ARGS= --with-recode-prefix="${LOCALBASE}" .include <bsd.port.pre.mk> pre-patch: - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|glib-config|glib12-config|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\$$(datadir)/gnome/|$$(datadir)/|g ; \ - s|\$$(datadir)/locale|$$(prefix)/share/locale|g' + @${REINPLACE_CMD} -e 's|glib-config|${GLIB_CONFIG}|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .if ${PYTHON_REL} >= 230 @${REINPLACE_CMD} 's|@DEFS@||g' ${WRKSRC}/compiled/Makefile.pre.in .endif diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile index 2f5828e6a93f..3c3b50bcad0f 100644 --- a/multimedia/libfame/Makefile +++ b/multimedia/libfame/Makefile @@ -16,7 +16,8 @@ MASTER_SITE_SUBDIR= fame MAINTAINER= ports@FreeBSD.org COMMENT= A video encoding library -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -38,4 +39,8 @@ CONFIGURE_ARGS+= --enable-sse CONFIGURE_ARGS+= --disable-mmx .endif +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + .include <bsd.port.post.mk> diff --git a/multimedia/libfame/pkg-plist b/multimedia/libfame/pkg-plist index 5025d41500e2..a87d05e1c294 100644 --- a/multimedia/libfame/pkg-plist +++ b/multimedia/libfame/pkg-plist @@ -27,5 +27,6 @@ include/fame_syntax_mpeg4.h include/fame_version.h lib/libfame.a lib/libfame.so +lib/libfame-0.9.so lib/libfame-0.9.so.1 share/aclocal/libfame.m4 diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index 47d7a64fea2a..b20d773b44f2 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -24,12 +24,18 @@ PLIST_FILES= lib/xmms/Input/libsmpeg_xmms.so USE_X_PREFIX= yes USE_SDL= sdl USE_GNOME= gnomehack gtk12 -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + # This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input do-install: + ${MKDIR} ${PREFIX}/lib/xmms/Input ${INSTALL_PROGRAM} \ ${WRKSRC}/src/.libs/libsmpeg_xmms.so ${PREFIX}/lib/xmms/Input diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 547a62b683c6..3bd607c8a97f 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -22,7 +22,7 @@ USE_GNOME= WANT_GNOME= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_SDL= sdl INSTALLS_SHLIB= yes CONFIGURE_ENV= GLBASE="${X11BASE}" \ @@ -44,8 +44,8 @@ USE_GNOME+= gtk12 CONFIGURE_ARGS+= --disable-gtk-player .endif -post-configure: - @${REINPLACE_CMD} -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ - ${WRKSRC}/libtool +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile index 5b126e096897..bd3ca2923a0f 100644 --- a/multimedia/xmps-opendivx-plugin/Makefile +++ b/multimedia/xmps-opendivx-plugin/Makefile @@ -21,7 +21,8 @@ LIB_DEPENDS= divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \ WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2 USE_GETTEXT= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes USE_GNOME= gtk12 USE_X_PREFIX= yes INSTALLS_SHLIB= yes @@ -30,6 +31,10 @@ PLIST_FILES= lib/xmps/codecs/video/libopendivx.so \ LIB_VERSION= 0 +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + post-install: @${LN} -sf libopendivx.so ${PREFIX}/lib/xmps/codecs/video/libopendivx.so.${LIB_VERSION} diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile index 4c70fb5d40b8..68077c37afc4 100644 --- a/multimedia/xmps-win32-plugin/Makefile +++ b/multimedia/xmps-win32-plugin/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT} USE_GETTEXT= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_GNOME= gtk12 USE_REINPLACE= yes USE_X_PREFIX= yes @@ -30,10 +30,11 @@ CODEC_PORT= ${.CURDIR}/../win32-codecs CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE LIB_VERSION= 0 PLIST_FILES= lib/xmps/codecs/video/libwin32.so \ - lib/xmps/codecs/video/libwin32.so.${LIB_VERSION} \ - lib/xmps/codecs/video/libwin32.la + lib/xmps/codecs/video/libwin32.so.${LIB_VERSION} post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|/usr/lib/win32|${LOCALBASE}/lib/win32|" \ ${WRKSRC}/src/win32_codec.c @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/src/* diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile index f6553dd3fdda..b8ae840be4ff 100644 --- a/multimedia/xmps/Makefile +++ b/multimedia/xmps/Makefile @@ -22,7 +22,7 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -33,12 +33,10 @@ BROKEN= "Does not compile on !i386" .endif post-patch: - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' -post-configure: - @${REINPLACE_CMD} -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ - ${WRKSRC}/libtool - .include <bsd.port.post.mk> diff --git a/multimedia/xmps/pkg-plist b/multimedia/xmps/pkg-plist index 94719a831582..a4cfe69cc1f5 100644 --- a/multimedia/xmps/pkg-plist +++ b/multimedia/xmps/pkg-plist @@ -2,10 +2,8 @@ bin/xmps bin/xmps-config include/libxmps/libxmps.h include/libxmps/libxmps_config.h -lib/libxmps.a lib/libxmps.so lib/libxmps.so.0 -lib/libxmpsutils.a lib/libxmpsutils.so lib/libxmpsutils.so.0 lib/xmps/addons/video/libvob.so diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 4b847042e3de..7c68d39ed1fd 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -26,7 +26,7 @@ USE_GNOME= gtk12 USE_GL= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gl @@ -34,6 +34,8 @@ CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]prefix[)]/Xtheater|(libdir)/Xtheater|g ; \ s|-release.*$$|-module -avoid-version|g' diff --git a/multimedia/xtheater/pkg-plist b/multimedia/xtheater/pkg-plist index 9fe6e0783630..6dbd34c99005 100644 --- a/multimedia/xtheater/pkg-plist +++ b/multimedia/xtheater/pkg-plist @@ -1,8 +1,6 @@ bin/xtheater lib/Xtheater/config -lib/Xtheater/player/libsmpeg.la lib/Xtheater/player/libsmpeg.so -lib/Xtheater/ui/libgtkui.la lib/Xtheater/ui/libgtkui.so @dirrm lib/Xtheater/ui @dirrm lib/Xtheater/player diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index 0740cc687f68..c4f23f511ccd 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -33,7 +33,7 @@ USE_GETOPT_LONG= yes USE_LIBLTDL= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 LIBTOOLFLAGS= # none CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-smtp --enable-jasper-filter diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist index b8565309a5f3..3335060c874b 100644 --- a/net-im/ayttm/pkg-plist +++ b/net-im/ayttm/pkg-plist @@ -1,45 +1,25 @@ bin/ayttm bin/ayttm_streamer_wrapper.sh etc/ayttmrc -lib/ayttm/aim-toc.la lib/ayttm/aim-toc.so -lib/ayttm/autotrans.la lib/ayttm/autotrans.so -lib/ayttm/aycryption.la lib/ayttm/aycryption.so -lib/ayttm/icq-toc.la lib/ayttm/icq-toc.so -lib/ayttm/img2jpc.la lib/ayttm/img2jpc.so -lib/ayttm/import_everybuddy.la lib/ayttm/import_everybuddy.so -lib/ayttm/import_gaim.la lib/ayttm/import_gaim.so -lib/ayttm/import_gnomeicu.la lib/ayttm/import_gnomeicu.so -lib/ayttm/importicq.la lib/ayttm/importicq.so -lib/ayttm/importlicq.la lib/ayttm/importlicq.so -lib/ayttm/irc.la lib/ayttm/irc.so -lib/ayttm/jabber.la lib/ayttm/jabber.so -lib/ayttm/middle.la lib/ayttm/middle.so -lib/ayttm/msn2.la lib/ayttm/msn2.so -lib/ayttm/notes.la lib/ayttm/notes.so -lib/ayttm/rainbow.la lib/ayttm/rainbow.so -lib/ayttm/smiley-themer.la lib/ayttm/smiley-themer.so -lib/ayttm/smtp.la lib/ayttm/smtp.so -lib/ayttm/video_capture.la lib/ayttm/video_capture.so -lib/ayttm/yahoo2.la lib/ayttm/yahoo2.so %%DATADIR%%/smileys/Console Smileys/aysmile.rc %%DATADIR%%/smileys/Console Smileys/blank.xpm diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile index 9fceddda87a3..0c8bf9253b08 100644 --- a/net-im/ickle/Makefile +++ b/net-im/ickle/Makefile @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_GNOME= gtk12 WANT_GNOME= yes USE_ICONV= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile index 2b77effbf240..86a4c5e9dc9a 100644 --- a/net-im/icqlib/Makefile +++ b/net-im/icqlib/Makefile @@ -16,7 +16,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library required by kicq (not libicq) INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_GMAKE= yes +USE_REINPLACE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile index 3bca75346245..c089a700b808 100644 --- a/net-im/libicq/Makefile +++ b/net-im/libicq/Makefile @@ -16,7 +16,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library to add ICQ communication support to your software USE_GNOME= glib12 -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes +USE_REINPLACE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile index 2720961dafe3..fd8dad7fa2ba 100644 --- a/net-im/libicq2000/Makefile +++ b/net-im/libicq2000/Makefile @@ -17,7 +17,7 @@ COMMENT= An opensource C++ library to support icq2000/2001 protocol LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ -USE_INC_LIBTOOL_VER=15 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --disable-static USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/net-im/libicq2000/pkg-plist b/net-im/libicq2000/pkg-plist index fe33bf5d601e..d3192506735f 100644 --- a/net-im/libicq2000/pkg-plist +++ b/net-im/libicq2000/pkg-plist @@ -39,6 +39,7 @@ include/libicq2000/time_extra.h include/libicq2000/userinfoconstants.h include/libicq2000/userinfohelpers.h include/libicq2000/version.h +lib/libicq2000.a lib/libicq2000.so lib/libicq2000.so.5 share/aclocal/libicq2000.m4 diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile index 28bbf180a74c..d806d330287f 100644 --- a/net-p2p/cdonkey/Makefile +++ b/net-p2p/cdonkey/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/cDonkey USE_BZIP2= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib" USE_GMAKE= yes WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION} diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile index e651ee5afd4d..dc23fadbf3f5 100644 --- a/net-p2p/libfreenet/Makefile +++ b/net-p2p/libfreenet/Makefile @@ -18,11 +18,13 @@ COMMENT= Freenet library written in C USE_REINPLACE= yes USE_OPENSSL= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet INSTALLS_SHLIB= yes post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile index 0740cc687f68..c4f23f511ccd 100644 --- a/net/ayttm/Makefile +++ b/net/ayttm/Makefile @@ -33,7 +33,7 @@ USE_GETOPT_LONG= yes USE_LIBLTDL= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 LIBTOOLFLAGS= # none CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-smtp --enable-jasper-filter diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist index b8565309a5f3..3335060c874b 100644 --- a/net/ayttm/pkg-plist +++ b/net/ayttm/pkg-plist @@ -1,45 +1,25 @@ bin/ayttm bin/ayttm_streamer_wrapper.sh etc/ayttmrc -lib/ayttm/aim-toc.la lib/ayttm/aim-toc.so -lib/ayttm/autotrans.la lib/ayttm/autotrans.so -lib/ayttm/aycryption.la lib/ayttm/aycryption.so -lib/ayttm/icq-toc.la lib/ayttm/icq-toc.so -lib/ayttm/img2jpc.la lib/ayttm/img2jpc.so -lib/ayttm/import_everybuddy.la lib/ayttm/import_everybuddy.so -lib/ayttm/import_gaim.la lib/ayttm/import_gaim.so -lib/ayttm/import_gnomeicu.la lib/ayttm/import_gnomeicu.so -lib/ayttm/importicq.la lib/ayttm/importicq.so -lib/ayttm/importlicq.la lib/ayttm/importlicq.so -lib/ayttm/irc.la lib/ayttm/irc.so -lib/ayttm/jabber.la lib/ayttm/jabber.so -lib/ayttm/middle.la lib/ayttm/middle.so -lib/ayttm/msn2.la lib/ayttm/msn2.so -lib/ayttm/notes.la lib/ayttm/notes.so -lib/ayttm/rainbow.la lib/ayttm/rainbow.so -lib/ayttm/smiley-themer.la lib/ayttm/smiley-themer.so -lib/ayttm/smtp.la lib/ayttm/smtp.so -lib/ayttm/video_capture.la lib/ayttm/video_capture.so -lib/ayttm/yahoo2.la lib/ayttm/yahoo2.so %%DATADIR%%/smileys/Console Smileys/aysmile.rc %%DATADIR%%/smileys/Console Smileys/blank.xpm diff --git a/net/cdonkey/Makefile b/net/cdonkey/Makefile index 28bbf180a74c..d806d330287f 100644 --- a/net/cdonkey/Makefile +++ b/net/cdonkey/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/cDonkey USE_BZIP2= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib" USE_GMAKE= yes WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION} diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile index 17f35b734e45..a8be9b74b797 100644 --- a/net/crescendo/Makefile +++ b/net/crescendo/Makefile @@ -20,7 +20,8 @@ RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_REINPLACE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ARGS+= --enable-compile-warnings=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" @@ -31,6 +32,10 @@ MODIFY= Makefile.in data/Makefile.in USE_X_PREFIX= yes USE_GNOME= gnomelibs +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + pre-patch: .for i in ${MODIFY} @${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed diff --git a/net/gnet/Makefile b/net/gnet/Makefile index 361665c41090..f0a744a6fba7 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -15,7 +15,7 @@ COMMENT= A simple network library built upon Glib USE_REINPLACE= yes USE_GNOME= gnomehack glib12 -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes MAN1= gnet-config.1 diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile index 49101c838bd4..6987034ead33 100644 --- a/net/gnometelnet/Makefile +++ b/net/gnometelnet/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/ickle/Makefile b/net/ickle/Makefile index 9fceddda87a3..0c8bf9253b08 100644 --- a/net/ickle/Makefile +++ b/net/ickle/Makefile @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_GNOME= gtk12 WANT_GNOME= yes USE_ICONV= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile index 2b77effbf240..86a4c5e9dc9a 100644 --- a/net/icqlib/Makefile +++ b/net/icqlib/Makefile @@ -16,7 +16,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library required by kicq (not libicq) INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_GMAKE= yes +USE_REINPLACE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile index 0b5ea80b7fce..5494cc277025 100644 --- a/net/icqlib0/Makefile +++ b/net/icqlib0/Makefile @@ -16,11 +16,16 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Old branch 0.x.x of library required by kicq (used by icqmail) USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes +USE_REINPLACE= yes LATEST_LINK= icqlib0 +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + post-install: ${INSTALL_DATA} ${WRKSRC}/icqlib/icq.h ${PREFIX}/include/icq0.h diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile index e651ee5afd4d..dc23fadbf3f5 100644 --- a/net/libfreenet/Makefile +++ b/net/libfreenet/Makefile @@ -18,11 +18,13 @@ COMMENT= Freenet library written in C USE_REINPLACE= yes USE_OPENSSL= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet INSTALLS_SHLIB= yes post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff --git a/net/libicq/Makefile b/net/libicq/Makefile index 3bca75346245..c089a700b808 100644 --- a/net/libicq/Makefile +++ b/net/libicq/Makefile @@ -16,7 +16,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library to add ICQ communication support to your software USE_GNOME= glib12 -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes +USE_REINPLACE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/net/libicq2000/Makefile b/net/libicq2000/Makefile index 2720961dafe3..fd8dad7fa2ba 100644 --- a/net/libicq2000/Makefile +++ b/net/libicq2000/Makefile @@ -17,7 +17,7 @@ COMMENT= An opensource C++ library to support icq2000/2001 protocol LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ -USE_INC_LIBTOOL_VER=15 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --disable-static USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/net/libicq2000/pkg-plist b/net/libicq2000/pkg-plist index fe33bf5d601e..d3192506735f 100644 --- a/net/libicq2000/pkg-plist +++ b/net/libicq2000/pkg-plist @@ -39,6 +39,7 @@ include/libicq2000/time_extra.h include/libicq2000/userinfoconstants.h include/libicq2000/userinfohelpers.h include/libicq2000/version.h +lib/libicq2000.a lib/libicq2000.so lib/libicq2000.so.5 share/aclocal/libicq2000.m4 diff --git a/net/libosip/Makefile b/net/libosip/Makefile index 4355001d8f65..97402a95fe1b 100644 --- a/net/libosip/Makefile +++ b/net/libosip/Makefile @@ -16,8 +16,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A low layer of SIP implementation USE_REINPLACE= yes -USE_INC_LIBTOOL_VER=13 -LIBTOOLFLAGS= --disable-ltlibs --release-ignore +USE_LIBTOOL_VER=15 +#LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes MAN1= osip.1 diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile index 5a8f0c482dc8..2544f3cd513d 100644 --- a/net/pvm++/Makefile +++ b/net/pvm++/Makefile @@ -20,7 +20,7 @@ COMMENT= A C++-Library for PVM BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \ --with-pvm-libs=${LOCALBASE}/lib INSTALLS_SHLIB= yes diff --git a/net/samba/Makefile b/net/samba/Makefile index 5fb0ba0b10ca..d0fa4da5391b 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -31,7 +31,7 @@ COMMENT= A free SMB and CIFS client and server for UNIX CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* USE_SUBMAKE= YES USE_GMAKE= YES -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 USE_AUTOCONF_VER= 213 # directories diff --git a/net/serveez/Makefile b/net/serveez/Makefile index cbf71296e66b..2e3636b138a0 100644 --- a/net/serveez/Makefile +++ b/net/serveez/Makefile @@ -25,11 +25,11 @@ GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config USE_GETOPT_LONG= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 -LIBTOOLFLAGS= --disable-ltlibs --release-ignore +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes +USE_REINPLACE= yes MAN1= serveez.1 serveez-config.1 INFO= serveez serveez-api @@ -37,4 +37,8 @@ INFO= serveez serveez-api CPPFLAGS= `${GUILE_CONFIG} compile` LDFLAGS= `${GUILE_CONFIG} link` +post-patch: + @${REINPLACE_CMD} -e 's|-release||g' \ + ${WRKSRC}/src/libserveez/Makefile.in + .include <bsd.port.mk> diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile index c654b86ff452..7f2b3d06b49d 100644 --- a/net/tn5250/Makefile +++ b/net/tn5250/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 5250 Telnet protocol and Terminal USE_REINPLACE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-os-dir=no INSTALLS_SHLIB= yes diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile index ab13daa88d13..432215d2f1d5 100644 --- a/net/xmlrpc-c-devel/Makefile +++ b/net/xmlrpc-c-devel/Makefile @@ -20,11 +20,16 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes +USE_REINPLACE= yes MAN1= meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \ query-meerkat.1 xml-rpc-api2txt.1 MAN7= xmlrpc-c.7 +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile index ab13daa88d13..432215d2f1d5 100644 --- a/net/xmlrpc-c/Makefile +++ b/net/xmlrpc-c/Makefile @@ -20,11 +20,16 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes +USE_REINPLACE= yes MAN1= meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \ query-meerkat.1 xml-rpc-api2txt.1 MAN7= xmlrpc-c.7 +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + .include <bsd.port.mk> |