diff options
45 files changed, 144 insertions, 120 deletions
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile index 681c80b7ca43..1baf6ec4b648 100644 --- a/editors/gnotepad+/Makefile +++ b/editors/gnotepad+/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_XPM= yes WANT_GNOME= yes USE_GNOME= gtk12 -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile index 898644c79acc..e18592d9acc1 100644 --- a/editors/xmleditor/Makefile +++ b/editors/xmleditor/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BISON= yes USE_GNOME= gnomehack libglade USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/editors/xmleditor/pkg-plist b/editors/xmleditor/pkg-plist index 6e45be77a216..22151899aefe 100644 --- a/editors/xmleditor/pkg-plist +++ b/editors/xmleditor/pkg-plist @@ -1,5 +1,4 @@ bin/xmleditor -lib/libgtk_xml_editor.a lib/libgtk_xml_editor.so lib/libgtk_xml_editor.so.1 %%DATADIR%%/config.xml diff --git a/emulators/libvm68k/Makefile b/emulators/libvm68k/Makefile index 9cb91a971d4f..ffc38dec5887 100644 --- a/emulators/libvm68k/Makefile +++ b/emulators/libvm68k/Makefile @@ -15,15 +15,14 @@ MASTER_SITES= ftp://ftp.hypercore.co.jp/vx68k/${PORTNAME}-${PORTVERSION:R}/ MAINTAINER= ports@FreeBSD.org COMMENT= M68000 virtual machine library -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes post-patch: @${REINPLACE_CMD} -e '/^#define _POSIX_C_SOURCE 199506L/d' \ ${WRKSRC}/memory.cc ${WRKSRC}/memory_map.cc ${WRKSRC}/version.cc - @${REINPLACE_CMD} -e '/^LTLIBRELEASE=/d' \ - -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir| ; \ + s|LTLIBRELEASE=".*"|LTLIBRELEASE=|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/emulators/libvm68k/pkg-plist b/emulators/libvm68k/pkg-plist index efa8ff427c2b..0e11610d5644 100644 --- a/emulators/libvm68k/pkg-plist +++ b/emulators/libvm68k/pkg-plist @@ -11,7 +11,6 @@ include/vm68k/types.h info/libvm68k.info @exec install-info %D/info/libvm68k.info %D/info/dir lib/libvm68k.a -lib/libvm68k.la lib/libvm68k.so lib/libvm68k.so.4 @dirrm include/vm68k diff --git a/emulators/vx68k/Makefile b/emulators/vx68k/Makefile index e57e74ae3668..dd631552fe1a 100644 --- a/emulators/vx68k/Makefile +++ b/emulators/vx68k/Makefile @@ -19,10 +19,10 @@ LIB_DEPENDS= vm68k.4:${PORTSDIR}/emulators/libvm68k USE_GL= yes USE_GNOME= gtk12 -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes LIBTOOLFILES= configure vx68k-gtk/configure -LIBTOOLFLAGS= --disable-ltlibs --release-ignore +#LIBTOOLFLAGS= --disable-ltlibs --release-ignore CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= vx68k.1 @@ -33,7 +33,10 @@ LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU \ ${PTHREAD_LIBS} post-patch: - @${REINPLACE_CMD} -e "s,Bison ,Bison,g" ${WRKSRC}/vx68k-gtk/configure + @${REINPLACE_CMD} -e 's|Bison |Bison|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir| ; \ + s|LTLIBRELEASE=".*"|LTLIBRELEASE=|' \ + ${WRKSRC}/configure ${WRKSRC}/vx68k-gtk/configure @${REINPLACE_CMD} -e '/^#define _POSIX_C_SOURCE 199506L/d' \ ${WRKSRC}/vx68k-gtk/libvx68k-gtk/gl.cc \ ${WRKSRC}/vx68k-gtk/libvx68k-gtk/gtkconsole.cc diff --git a/emulators/vx68k/pkg-plist b/emulators/vx68k/pkg-plist index fbc229a48db9..1da85e5c32d5 100644 --- a/emulators/vx68k/pkg-plist +++ b/emulators/vx68k/pkg-plist @@ -6,5 +6,9 @@ include/vx68k/machine.h include/vx68k/memory.h include/vx68k/version.h lib/libvx68k.a +lib/libvx68k.so +lib/libvx68k.so.1 lib/libvx68kdos.a +lib/libvx68kdos.so +lib/libvx68kdos.so.1 @dirrm include/vx68k diff --git a/finance/emma/Makefile b/finance/emma/Makefile index cff206a15c61..8db32172489a 100644 --- a/finance/emma/Makefile +++ b/finance/emma/Makefile @@ -20,10 +20,15 @@ USE_X_PREFIX= yes USE_PYTHON= yes USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes -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|g' \ + ${WRKSRC}/configure + pre-configure: @${RM} -f ${WRKSRC}/config.cache diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile index 299e0e390089..a29ab9b49115 100644 --- a/finance/gnofin/Makefile +++ b/finance/gnofin/Makefile @@ -18,7 +18,7 @@ COMMENT= Light-weight GNOME based financial management program USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -28,7 +28,8 @@ MAN1= gnofin.1 post-patch: @${REINPLACE_CMD} -e \ 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ - s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g' diff --git a/finance/gnofin/pkg-plist b/finance/gnofin/pkg-plist index d0248bb3e4d6..acf4aead69f9 100644 --- a/finance/gnofin/pkg-plist +++ b/finance/gnofin/pkg-plist @@ -1,19 +1,19 @@ bin/gnofin -lib/gnofin/plugins/libcbb.la +lib/gnofin/plugins/libcbb.a lib/gnofin/plugins/libcbb.so -lib/gnofin/plugins/libfind.la +lib/gnofin/plugins/libfind.a lib/gnofin/plugins/libfind.so -lib/gnofin/plugins/libhtml.la +lib/gnofin/plugins/libhtml.a lib/gnofin/plugins/libhtml.so -lib/gnofin/plugins/liblatex.la +lib/gnofin/plugins/liblatex.a lib/gnofin/plugins/liblatex.so -lib/gnofin/plugins/libqif.la +lib/gnofin/plugins/libqif.a lib/gnofin/plugins/libqif.so -lib/gnofin/plugins/libreconcile.la +lib/gnofin/plugins/libreconcile.a lib/gnofin/plugins/libreconcile.so -lib/gnofin/plugins/libsched.la +lib/gnofin/plugins/libsched.a lib/gnofin/plugins/libsched.so -lib/gnofin/plugins/libtext.la +lib/gnofin/plugins/libtext.a lib/gnofin/plugins/libtext.so share/gnome/apps/Applications/gnofin.desktop share/locale/cs/LC_MESSAGES/gnofin.mo diff --git a/games/adgali/Makefile b/games/adgali/Makefile index f31ef1c8612e..9e857a70ad56 100644 --- a/games/adgali/Makefile +++ b/games/adgali/Makefile @@ -25,8 +25,7 @@ USE_SDL= sdl USE_GNOME= gnometarget USE_REINPLACE= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 -LIBTOOLFLAGS= --disable-ltlibs --release-ignore +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes @@ -39,6 +38,7 @@ BROKEN= "Configure fails" post-patch: @${REINPLACE_CMD} -e 's|-O3 ||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-release $$(LT_RELEASE)||g' ${WRKSRC}/src/Makefile.in post-install: .if !defined(NOPORTDOCS) diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile index 2c90823406ac..df46e73fa4a0 100644 --- a/games/bomberinstinct/Makefile +++ b/games/bomberinstinct/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_SDL= mixer sdl USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_PERL5_BUILD=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" diff --git a/games/glife/Makefile b/games/glife/Makefile index 42ead64abdfc..6dfae69b64f7 100644 --- a/games/glife/Makefile +++ b/games/glife/Makefile @@ -18,12 +18,14 @@ COMMENT= Conway's Game of Life for GNOME USE_REINPLACE= yes USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_GNOME= gnomeprefix gnomehack libglade CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile index c8f714f4e0ad..e7230ff69530 100644 --- a/games/gno3dtet/Makefile +++ b/games/gno3dtet/Makefile @@ -20,13 +20,15 @@ USE_REINPLACE= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure post-install: ${CHOWN} root:games ${PREFIX}/bin/gno3dtet diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile index b9b23e56d3b9..adf1999bf6f2 100644 --- a/games/gnomememoryblocks/Makefile +++ b/games/gnomememoryblocks/Makefile @@ -19,12 +19,14 @@ COMMENT= Memory Blocks game for GNOME USE_REINPLACE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/gnomememoryblocks/pkg-plist b/games/gnomememoryblocks/pkg-plist index 773de269da82..9046f58a6c7a 100644 --- a/games/gnomememoryblocks/pkg-plist +++ b/games/gnomememoryblocks/pkg-plist @@ -1,8 +1,6 @@ bin/gnome-memblocks etc/sound/events/gnome-memblocks.soundlist -lib/gnome-memblocks/libscaling.la lib/gnome-memblocks/libscaling.so -lib/gnome-memblocks/libsliding.la lib/gnome-memblocks/libsliding.so share/gnome/apps/Games/gnome-memblocks.desktop share/gnome/games/gnome-memblocks.default.scores diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 2c57a7c1b5ed..0c2bef3cdf0f 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -17,7 +17,7 @@ COMMENT= A simple turing machine simulator for GNOME 2 USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" INSTALLS_OMF= yes diff --git a/games/teg/Makefile b/games/teg/Makefile index 90b444d32bd4..a15049f40b4c 100644 --- a/games/teg/Makefile +++ b/games/teg/Makefile @@ -18,7 +18,7 @@ COMMENT= A turn-based strategy game for GNOME USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui lthack USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile index f52ed89993a7..7acb87acb855 100644 --- a/graphics/Hermes/Makefile +++ b/graphics/Hermes/Makefile @@ -18,7 +18,7 @@ COMMENT= Fast pixel formats conversion library USE_BZIP2= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 3adb436fdab9..234774f5b588 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -18,7 +18,7 @@ COMMENT= An ascii art library WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 USE_REINPLACE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes .if !defined(WITHOUT_X11) @@ -56,7 +56,8 @@ post-extract: post-patch: @${RM} -f ${WRKSRC}/config.cache @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ - s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \ + s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} \( -name '*.[ch]' \! -name acconfig.h \) \ | ${XARGS} ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index ea2b07e791fc..898d7a4dd0ff 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gnometarget lthack USE_BISON= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile index 806e5dd109dc..7e7c7a789d89 100644 --- a/graphics/diacanvas/Makefile +++ b/graphics/diacanvas/Makefile @@ -20,7 +20,12 @@ COMMENT= A general drawing canvas from dia dialog editor USE_X_PREFIX= yes USE_GNOME= gtk12 imlib gnomehack -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/graphics/entice/Makefile b/graphics/entice/Makefile index adeaf03fa52e..671fd4e3a3f8 100644 --- a/graphics/entice/Makefile +++ b/graphics/entice/Makefile @@ -20,8 +20,13 @@ LIB_DEPENDS= ecore.0:${PORTSDIR}/x11/ecore \ evas.6:${PORTSDIR}/graphics/evas USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +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/graphics/evas/Makefile b/graphics/evas/Makefile index 7555b2675d76..9b5e34ae9f95 100644 --- a/graphics/evas/Makefile +++ b/graphics/evas/Makefile @@ -19,12 +19,17 @@ LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 USE_BZIP2= yes USE_X_PREFIX= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_FREETYPE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" CONFIGURE_ARGS= --disable-gl 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/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 0007a003da92..9db83153d637 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -18,7 +18,7 @@ COMMENT= Fonts and font libraries necessary for Enlightenment USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= imlib -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index 2c7c58d52b5e..d2622b192ed0 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -20,7 +20,7 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint USE_GMAKE= yes USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile index 9c123eb898bf..fbcb7eda699d 100644 --- a/graphics/gtkdps/Makefile +++ b/graphics/gtkdps/Makefile @@ -19,7 +19,8 @@ BUILD_DEPENDS= pswrap:${PORTSDIR}/x11/dgs RUN_DEPENDS= pswrap:${PORTSDIR}/x11/dgs USE_GNOME= gtk12 -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \ --with-dps-libraries=${X11BASE}/lib @@ -30,4 +31,8 @@ CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \ BROKEN= "Does not compile on alpha" .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/graphics/guilib/Makefile b/graphics/guilib/Makefile index 3539c9b640fb..da600bd1493b 100644 --- a/graphics/guilib/Makefile +++ b/graphics/guilib/Makefile @@ -17,8 +17,13 @@ COMMENT= A very simple GUI framework for use with SDL USE_SDL= sdl USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 -LIBTOOLFLAGS= --disable-ltlibs --release-ignore +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 + @${REINPLACE_CMD} -e 's|-release $$(LT_RELEASE)||g' ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index d11e5e3729ad..79f0273ef390 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_ZIP= yes USE_GNOME= gnometarget lthack -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 LIBTOOLFLAGS= --disable-ltlibs --release-ignore CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile index d466adceca93..70b71c9cb428 100644 --- a/graphics/libgrass5/Makefile +++ b/graphics/libgrass5/Makefile @@ -15,8 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library of functions from the GRASS GIS application for use by non-GRASS programs USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} 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/graphics/libmorph/Makefile b/graphics/libmorph/Makefile index f3785936b40d..19c58b7f9ce5 100644 --- a/graphics/libmorph/Makefile +++ b/graphics/libmorph/Makefile @@ -15,7 +15,12 @@ COMMENT= A library for loading (and saving) 3d modeller object files CONFLICTS= xmorph* -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/graphics/mesagl/Makefile b/graphics/mesagl/Makefile index 0704a2e7a919..a3b8b0b720fa 100644 --- a/graphics/mesagl/Makefile +++ b/graphics/mesagl/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE} .endif USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ENV+= GLVER="${GLVER}" LIBS="-lm" SUB_GL= src si-glu src-glu diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist index 5a6abf581411..e5d4e636b333 100644 --- a/graphics/mesagl/pkg-plist +++ b/graphics/mesagl/pkg-plist @@ -6,14 +6,22 @@ include/GL/glu_mangle.h include/GL/glx.h include/GL/glx_mangle.h include/GL/glext.h +include/GL/glut.h +include/GL/glutf90.h +include/GL/glxext.h include/GL/osmesa.h include/GL/xmesa.h include/GL/xmesa_x.h include/GL/xmesa_xf86.h +lib/libGL.a lib/libGL.so lib/libGL.so.14 +lib/libGLU.a lib/libGLU.so lib/libGLU.so.14 lib/libMesaGL.so lib/libMesaGLU.so +lib/libOSMesa.a +lib/libOSMesa.so +lib/libOSMesa.so.4 @dirrm include/GL diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile index 4c5dfb2a0971..13edd440d026 100644 --- a/graphics/paintlib/Makefile +++ b/graphics/paintlib/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ tiff:${PORTSDIR}/graphics/tiff \ ungif:${PORTSDIR}/graphics/libungif -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-SDL --disable-dfb diff --git a/graphics/paintlib/pkg-plist b/graphics/paintlib/pkg-plist index b526da1c266f..980c6f053024 100644 --- a/graphics/paintlib/pkg-plist +++ b/graphics/paintlib/pkg-plist @@ -94,7 +94,6 @@ include/paintlib/test/pltestfilters.h include/paintlib/test/pltestcountedpointer.h include/paintlib/test/pltestexif.h lib/libpaintlib.a -lib/libpaintlib.la lib/libpaintlib.so lib/libpaintlib.so.1 bin/paintlib-config diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index f59dceed33bc..df5096dcfa26 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -17,7 +17,7 @@ COMMENT= A plotting library and toolkit LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_MOTIF= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MOTIFLIB="${MOTIFLIB}" \ @@ -30,6 +30,8 @@ MAN1= ode.1 plot.1 plotfont.1 spline.1 tek2plot.1 INFO= libxmi plotutils pre-patch: - @${REINPLACE_CMD} -e 's|-lXm |\$$\{MOTIFLIB\} |g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lXm |\$$\{MOTIFLIB\} |g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 077570a06a60..2d5a44fdc3df 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/ MAINTAINER= ports@FreeBSD.org COMMENT= Convert PostScript to other vector graphic formats -USE_GHOSTSCRIPT= yes +USE_GHOSTSCRIPT=yes LIB_DEPENDS= Magick++.8:${PORTSDIR}/graphics/ImageMagick \ ming.3:${PORTSDIR}/graphics/ming \ @@ -22,7 +22,7 @@ LIB_DEPENDS= Magick++.8:${PORTSDIR}/graphics/ImageMagick \ EMF.1:${PORTSDIR}/graphics/libemf USE_GNOME= gnometarget pkgconfig -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --with-libemf-include=${LOCALBASE}/include/libEMF diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile index 4764c0771a9e..53bb81dca4cb 100644 --- a/graphics/qglviewer/Makefile +++ b/graphics/qglviewer/Makefile @@ -18,7 +18,7 @@ COMMENT= Use OpenGL to play around with three dimensional scenes USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${X11BASE}" INSTALLS_SHLIB= yes diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile index 1d1053171a08..207b3b887ccc 100644 --- a/graphics/qtutils/Makefile +++ b/graphics/qtutils/Makefile @@ -19,9 +19,9 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ quicktime.0:${PORTSDIR}/multimedia/libquicktime USE_GNOME= glib12 -USE_GETOPT_LONG= yes +USE_GETOPT_LONG=yes USE_REINPLACE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 24dae6b14901..6614b32836e9 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -22,7 +22,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_GNOME= gnometarget lthack USE_GMAKE= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} \ @@ -59,5 +60,11 @@ CONFIGURE_ARGS+= --with-gphoto2=no PLIST_SUB+= GPHOTO2="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|LIBTOOL =.*|LIBTOOL = ${LIBTOOL}|' \ + ${WRKSRC}/backend/Makefile.in ${WRKSRC}/frontend/Makefile.in \ + ${WRKSRC}/japi/Makefile.in ${WRKSRC}/lib/Makefile.in \ + ${WRKSRC}/sanei/Makefile.in ${WRKSRC}/tools/Makefile.in + .include "Makefile.man" .include <bsd.port.post.mk> diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist index 7aeea099bc91..730eb84ddf74 100644 --- a/graphics/sane-backends/pkg-plist +++ b/graphics/sane-backends/pkg-plist @@ -59,166 +59,112 @@ include/sane/saneopts.h lib/libsane.a lib/libsane.so lib/libsane.so.1 -lib/sane/libsane-abaton.a lib/sane/libsane-abaton.so lib/sane/libsane-abaton.so.1 -lib/sane/libsane-agfafocus.a lib/sane/libsane-agfafocus.so lib/sane/libsane-agfafocus.so.1 -lib/sane/libsane-apple.a lib/sane/libsane-apple.so lib/sane/libsane-apple.so.1 -lib/sane/libsane-artec.a lib/sane/libsane-artec.so lib/sane/libsane-artec.so.1 -lib/sane/libsane-artec_eplus48u.a lib/sane/libsane-artec_eplus48u.so lib/sane/libsane-artec_eplus48u.so.1 -lib/sane/libsane-as6e.a lib/sane/libsane-as6e.so lib/sane/libsane-as6e.so.1 -lib/sane/libsane-avision.a lib/sane/libsane-avision.so lib/sane/libsane-avision.so.1 -lib/sane/libsane-bh.a lib/sane/libsane-bh.so lib/sane/libsane-bh.so.1 -lib/sane/libsane-canon.a lib/sane/libsane-canon.so lib/sane/libsane-canon.so.1 -lib/sane/libsane-canon630u.a lib/sane/libsane-canon630u.so lib/sane/libsane-canon630u.so.1 -lib/sane/libsane-coolscan.a lib/sane/libsane-coolscan.so lib/sane/libsane-coolscan.so.1 -lib/sane/libsane-coolscan2.a lib/sane/libsane-coolscan2.so lib/sane/libsane-coolscan2.so.1 -lib/sane/libsane-dc210.a lib/sane/libsane-dc210.so lib/sane/libsane-dc210.so.1 -lib/sane/libsane-dc240.a lib/sane/libsane-dc240.so lib/sane/libsane-dc240.so.1 -lib/sane/libsane-dc25.a lib/sane/libsane-dc25.so lib/sane/libsane-dc25.so.1 -lib/sane/libsane-dll.a lib/sane/libsane-dll.so lib/sane/libsane-dll.so.1 -lib/sane/libsane-dmc.a lib/sane/libsane-dmc.so lib/sane/libsane-dmc.so.1 -lib/sane/libsane-epson.a lib/sane/libsane-epson.so lib/sane/libsane-epson.so.1 -lib/sane/libsane-fujitsu.a lib/sane/libsane-fujitsu.so lib/sane/libsane-fujitsu.so.1 -%%GPHOTO2%%lib/sane/libsane-gphoto2.a %%GPHOTO2%%lib/sane/libsane-gphoto2.so %%GPHOTO2%%lib/sane/libsane-gphoto2.so.1 -lib/sane/libsane-gt68xx.a lib/sane/libsane-gt68xx.so lib/sane/libsane-gt68xx.so.1 -lib/sane/libsane-hp.a lib/sane/libsane-hp.so lib/sane/libsane-hp.so.1 -lib/sane/libsane-hp5400.a lib/sane/libsane-hp5400.so lib/sane/libsane-hp5400.so.1 -lib/sane/libsane-ibm.a lib/sane/libsane-ibm.so lib/sane/libsane-ibm.so.1 -lib/sane/libsane-leo.a lib/sane/libsane-leo.so lib/sane/libsane-leo.so.1 -lib/sane/libsane-ma1509.a lib/sane/libsane-ma1509.so lib/sane/libsane-ma1509.so.1 -lib/sane/libsane-matsushita.a lib/sane/libsane-matsushita.so lib/sane/libsane-matsushita.so.1 -lib/sane/libsane-microtek.a lib/sane/libsane-microtek.so lib/sane/libsane-microtek.so.1 -lib/sane/libsane-microtek2.a lib/sane/libsane-microtek2.so lib/sane/libsane-microtek2.so.1 -lib/sane/libsane-mustek.a lib/sane/libsane-mustek.so lib/sane/libsane-mustek.so.1 -lib/sane/libsane-mustek_usb.a lib/sane/libsane-mustek_usb.so lib/sane/libsane-mustek_usb.so.1 -lib/sane/libsane-nec.a lib/sane/libsane-nec.so lib/sane/libsane-nec.so.1 -lib/sane/libsane-net.a lib/sane/libsane-net.so lib/sane/libsane-net.so.1 -lib/sane/libsane-niash.a lib/sane/libsane-niash.so lib/sane/libsane-niash.so.1 -lib/sane/libsane-pie.a lib/sane/libsane-pie.so lib/sane/libsane-pie.so.1 -lib/sane/libsane-plustek.a lib/sane/libsane-plustek.so lib/sane/libsane-plustek.so.1 -lib/sane/libsane-plustek_pp.a lib/sane/libsane-plustek_pp.so lib/sane/libsane-plustek_pp.so.1 -lib/sane/libsane-ricoh.a lib/sane/libsane-ricoh.so lib/sane/libsane-ricoh.so.1 -lib/sane/libsane-s9036.a lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.1 -lib/sane/libsane-sceptre.a lib/sane/libsane-sceptre.so lib/sane/libsane-sceptre.so.1 -lib/sane/libsane-sharp.a lib/sane/libsane-sharp.so lib/sane/libsane-sharp.so.1 -%%USB%%lib/sane/libsane-sm3600.a %%USB%%lib/sane/libsane-sm3600.so %%USB%%lib/sane/libsane-sm3600.so.1 -lib/sane/libsane-snapscan.a lib/sane/libsane-snapscan.so lib/sane/libsane-snapscan.so.1 -lib/sane/libsane-sp15c.a lib/sane/libsane-sp15c.so lib/sane/libsane-sp15c.so.1 -lib/sane/libsane-st400.a lib/sane/libsane-st400.so lib/sane/libsane-st400.so.1 -lib/sane/libsane-tamarack.a lib/sane/libsane-tamarack.so lib/sane/libsane-tamarack.so.1 -lib/sane/libsane-teco1.a lib/sane/libsane-teco1.so lib/sane/libsane-teco1.so.1 -lib/sane/libsane-teco2.a lib/sane/libsane-teco2.so lib/sane/libsane-teco2.so.1 -lib/sane/libsane-teco3.a lib/sane/libsane-teco3.so lib/sane/libsane-teco3.so.1 -lib/sane/libsane-test.a lib/sane/libsane-test.so lib/sane/libsane-test.so.1 -lib/sane/libsane-u12.a lib/sane/libsane-u12.so lib/sane/libsane-u12.so.1 -lib/sane/libsane-umax.a lib/sane/libsane-umax.so lib/sane/libsane-umax.so.1 -lib/sane/libsane-umax1220u.a lib/sane/libsane-umax1220u.so lib/sane/libsane-umax1220u.so.1 -lib/sane/libsane-umax_pp.a lib/sane/libsane-umax_pp.so lib/sane/libsane-umax_pp.so.1 sbin/saned diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index 19232e5a700d..f7a5425be96f 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -28,7 +28,8 @@ USE_X_PREFIX= yes USE_QT_VER= 3 USE_MESA= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_REINPLACE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= QTDIR="${QT_PREFIX}" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" @@ -36,4 +37,8 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ QTCPPFLAGS+= ${PTHREAD_CFLAGS} QTCFGLIBS+= ${PTHREAD_LIBS} +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/graphics/vp/Makefile b/graphics/vp/Makefile index 9fd1836d4ad3..f25d23cb97fe 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -17,7 +17,7 @@ COMMENT= An image viewer for X PLIST_FILES= bin/vp USE_SDL= image USE_GETOPT_LONG=yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile index 7936f55b3cd4..b175a8f2b05a 100644 --- a/graphics/xmms-xvs/Makefile +++ b/graphics/xmms-xvs/Makefile @@ -28,13 +28,15 @@ USE_BISON= yes USE_GNOME= gtk12 libxml2 USE_REINPLACE= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= XMMS_CONFIG="${XMMS_CONFIG}" .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's|<xml|<libxml/xml|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|<xml|<libxml/xml|g ; \ + s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile index 9533a9c51264..9c14e4c82309 100644 --- a/x11/ecore/Makefile +++ b/x11/ecore/Makefile @@ -15,8 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A core event abstraction library USE_X_PREFIX= yes -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 post-install: @${STRIP_CMD} ${PREFIX}/lib/libecore.so.0 |