diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/aria/Makefile | 4 | ||||
-rw-r--r-- | www/dpsearch/Makefile | 7 | ||||
-rw-r--r-- | www/dpsearch/pkg-plist | 2 | ||||
-rw-r--r-- | www/libwww/Makefile | 7 | ||||
-rw-r--r-- | www/mnogosearch/Makefile | 8 | ||||
-rw-r--r-- | www/mnogosearch/files/patch-ad | 46 | ||||
-rw-r--r-- | www/mnogosearch/pkg-plist | 1 | ||||
-rw-r--r-- | www/scout/Makefile | 2 |
8 files changed, 22 insertions, 55 deletions
diff --git a/www/aria/Makefile b/www/aria/Makefile index e19ba9cebc5f..1fef75d2fcc0 100644 --- a/www/aria/Makefile +++ b/www/aria/Makefile @@ -19,10 +19,10 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnometarget gtk12 USE_OPENSSL= yes -USE_GETOPT_LONG= yes +USE_GETOPT_LONG=yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile index 999e6741a185..a28ccae76f07 100644 --- a/www/dpsearch/Makefile +++ b/www/dpsearch/Makefile @@ -19,7 +19,8 @@ COMMENT= Open source search engine for Internet and Intranet sites INSTALLS_SHLIB= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes DOCSDIR= ${PREFIX}/share/doc/dataparksearch CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \ @@ -122,6 +123,10 @@ CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} .endif +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + pre-install: @${MKDIR} ${DATADIR} diff --git a/www/dpsearch/pkg-plist b/www/dpsearch/pkg-plist index 8a57fe8364d8..d686a185b8a0 100644 --- a/www/dpsearch/pkg-plist +++ b/www/dpsearch/pkg-plist @@ -260,11 +260,9 @@ include/dps_xmalloc.h include/dpsearch.h lib/libdpcharset-4.so lib/libdpcharset.a -lib/libdpcharset.la lib/libdpcharset.so lib/libdpsearch-4.so lib/libdpsearch.a -lib/libdpsearch.la lib/libdpsearch.so sbin/cached sbin/dpconv diff --git a/www/libwww/Makefile b/www/libwww/Makefile index eab75b71930c..9e6616d56b74 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -16,12 +16,17 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= The W3C Reference Library -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ARGS= --enable-shared --enable-static --with-zlib USE_PERL5_BUILD=yes MAKE_ENV= objformat=${PORTOBJFORMAT} 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: ${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \ diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index 5bc60ef3b74a..8f2549f59adf 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -20,8 +20,10 @@ MAN1= indexer.1 MAN5= indexer.conf.5 INSTALLS_SHLIB= yes +USE_GNOME= lthack USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--enable-phrase \ @@ -85,6 +87,10 @@ pre-configure: @exit 1 .endif +post-patch: + @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ + ${WRKSRC}/configure + pre-install: @${MKDIR} ${PREFIX}/share/mnogosearch diff --git a/www/mnogosearch/files/patch-ad b/www/mnogosearch/files/patch-ad index 9b5300f64807..5334d08f91e4 100644 --- a/www/mnogosearch/files/patch-ad +++ b/www/mnogosearch/files/patch-ad @@ -1,31 +1,5 @@ --- configure.orig Tue Jun 17 13:35:22 2003 +++ configure Mon Jun 14 07:46:23 2004 -@@ -3176,13 +3176,14 @@ - fi - rm -f confcache - -+lt_aux_dir=${LOCALBASE}/share/libtool13 - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ - LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ - DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ -+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \ -+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \ - || { { echo "$as_me:$LINENO: error: libtool configure failed" >&5 - echo "$as_me: error: libtool configure failed" >&2;} - { (exit 1); exit 1; }; } -@@ -3207,7 +3208,7 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -3659,6 +3660,8 @@ #line $LINENO "configure" #include "confdefs.h" @@ -46,23 +20,3 @@ else echo "$as_me:$LINENO: result: disabled" >&5 echo "${ECHO_T}disabled" >&6 -@@ -7553,8 +7556,8 @@ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ - LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ - DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ -+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \ -+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \ - || { { echo "$as_me:$LINENO: error: libtool configure failed" >&5 - echo "$as_me: error: libtool configure failed" >&2;} - { (exit 1); exit 1; }; } -@@ -7579,7 +7582,7 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist index b76e0254bf05..715bd8f8860e 100644 --- a/www/mnogosearch/pkg-plist +++ b/www/mnogosearch/pkg-plist @@ -44,7 +44,6 @@ include/udm_word.h include/udm_xmalloc.h include/udmsearch.h lib/libudmsearch.a -lib/libudmsearch.la lib/libudmsearch.so lib/libudmsearch.so.1 sbin/cachelogd diff --git a/www/scout/Makefile b/www/scout/Makefile index a525e4ea42ef..1f2e019d03b9 100644 --- a/www/scout/Makefile +++ b/www/scout/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://sid.joedog.org/pub/scout/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A utility to harvest URLs from a given start point -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS+= --disable-shared --enable-static MAN1= scout.1 PLIST_FILES= bin/scout |