Date: Thu, 15 Nov 2001 20:05:02 -0600 (CST) From: Jeremy Norris <ishmael27@home.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/32027: Update port lang/ferite Message-ID: <200111160205.fAG252T53296@babylon.merseine.nu>
next in thread | raw e-mail | index | archive | help
>Number: 32027
>Category: ports
>Synopsis: Update port lang/ferite
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 15 18:10:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Norris
>Release: FreeBSD 4.4-STABLE i386
>Organization:
None
>Environment:
System: FreeBSD babylon.merseine.nu 4.4-STABLE FreeBSD 4.4-STABLE #0: Mon Nov 5 20:03:33 CST 2001 ishmael@babylon.merseine.nu:/usr/obj/usr/src/sys/BABYLON i386
>Description:
Update port lang/ferite to latest version, 0.99.3.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 14 Nov 2001 03:12:34 -0000 1.2
+++ Makefile 16 Nov 2001 00:25:22 -0000
@@ -6,15 +6,13 @@
#
PORTNAME= ferite
-PORTVERSION= 0.99.2
+PORTVERSION= 0.99.3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ishmael27@home.com
-BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
-
LIB_DEPENDS= ltdl.1:${PORTSDIR}/devel/libtool \
mysqlclient.10:${PORTSDIR}/databases/mysql323-client \
pcre.0:${PORTSDIR}/devel/pcre \
@@ -40,8 +38,9 @@
.endif
post-patch:
- @${PERL} -pi -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:S/"//g}|g' \
- ${WRKSRC}/ferite-config.in
+ @${PERL} -pi -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
+ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:S/"//g}|g' \
+ ${WRKSRC}/configure ${WRKSRC}/ferite-config.in
post-configure:
@${PERL} -pi -e 's|^s%\@LIBS.*|s%\@LIBS\@%-L${LOCALBASE}/lib%g|' \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 14 Nov 2001 03:12:34 -0000 1.2
+++ distinfo 16 Nov 2001 00:05:56 -0000
@@ -1 +1 @@
-MD5 (ferite-0.99.2.tar.gz) = 036385afde16239ea17792b5a268d72d
+MD5 (ferite-0.99.3.tar.gz) = 294b9161383c3bc4080753c778db5c6e
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 14 Oct 2001 14:45:04 -0000 1.1
+++ pkg-plist 16 Nov 2001 00:45:10 -0000
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
bin/builder
bin/ferite
bin/ferite-config
@@ -35,6 +36,7 @@
lib/ferite/modules/time.so
lib/ferite/modules/xml.so
lib/ferite/scripts/cgi/cgi.fe
+lib/ferite/scripts/test/autoload.fe
lib/ferite/scripts/test/error.fe
lib/ferite/scripts/test/helloworld.fe
lib/ferite/scripts/test/loop.fe
@@ -49,6 +51,7 @@
lib/ferite/scripts/test/test2.fe
lib/ferite/scripts/test/testfncparams.fe
lib/ferite/scripts/test/uarray.fe
+lib/ferite/scripts/test/var_args.fe
lib/libferite.a
lib/libferite.so
lib/libferite.so.0
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/files/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- files/patch-configure 14 Nov 2001 03:12:36 -0000 1.2
+++ files/patch-configure 16 Nov 2001 00:40:21 -0000
@@ -1,5 +1,8 @@
---- configure.orig Sun Nov 11 11:47:08 2001
-+++ configure Sun Nov 11 21:39:39 2001
+
+$FreeBSD$
+
+--- configure.orig Thu Nov 15 11:09:00 2001
++++ configure Thu Nov 15 18:26:26 2001
@@ -261,7 +261,6 @@
: ${ac_max_here_lines=38}
@@ -27,29 +30,20 @@
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
-@@ -6507,7 +6494,7 @@
- build_old_libs=$enable_static
-
- # Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$need_lc
-+build_libtool_need_lc=no
-
- # Whether or not to optimize for fast installation.
- fast_install=$enable_fast_install
@@ -7096,13 +7083,13 @@
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:7099: checking for pthread_mutex_lock in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_lock in -lpthread... $ECHO_C" >&6
-+echo "$as_me:7099: checking for pthread_mutex_lock in -pthread" >&5
-+echo $ECHO_N "checking for pthread_mutex_lock in -pthread... $ECHO_C" >&6
++echo "$as_me:7099: checking for pthread_mutex_lock in %%PTHREAD_LIBS%%" >&5
++echo $ECHO_N "checking for pthread_mutex_lock in %%PTHREAD_LIBS%%... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-+LIBS="-pthread $LIBS"
++LIBS="%%PTHREAD_LIBS%% $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 7107 "configure"
#include "confdefs.h"
@@ -58,7 +52,7 @@
EOF
- LIBS="-lpthread $LIBS"
-+ LIBS="-pthread $LIBS"
++ LIBS="%%PTHREAD_LIBS%% $LIBS"
else
Index: files/patch-ferite-config.in
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/files/patch-ferite-config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-ferite-config.in
--- files/patch-ferite-config.in 14 Oct 2001 14:45:04 -0000 1.1
+++ files/patch-ferite-config.in 16 Nov 2001 00:40:51 -0000
@@ -1,6 +1,14 @@
+
+$FreeBSD$
+
--- ferite-config.in.orig Wed Jul 25 15:47:03 2001
-+++ ferite-config.in Sat Aug 25 19:13:09 2001
-@@ -46,7 +46,7 @@
++++ ferite-config.in Thu Nov 15 18:21:57 2001
+@@ -42,11 +42,11 @@
+ if test @includedir@ != /usr/include ; then
+ includes=-I@includedir@
+ fi
+- echo $includes @debugdefs@
++ echo %%PTHREAD_CFLAGS%% $includes @debugdefs@
;;
--libs)
libdirs=-L@libdir@
Index: files/patch-ltmain.sh
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/files/patch-ltmain.sh,v
retrieving revision 1.2
diff -u -r1.2 patch-ltmain.sh
--- files/patch-ltmain.sh 31 Oct 2001 08:32:29 -0000 1.2
+++ files/patch-ltmain.sh 16 Nov 2001 00:38:28 -0000
@@ -1,8 +1,8 @@
$FreeBSD: ports/lang/ferite/files/patch-ltmain.sh,v 1.2 2001/10/31 08:32:29 sobomax Exp $
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
+--- ltmain.sh.orig Tue Aug 14 16:55:55 2001
++++ ltmain.sh Thu Nov 15 18:07:04 2001
@@ -944,6 +944,7 @@
;;
@@ -11,7 +11,7 @@
avoid_version=yes
continue
;;
-@@ -2408,6 +2408,9 @@
+@@ -2408,6 +2409,9 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
@@ -20,8 +20,8 @@
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+ if test $build_libtool_need_lc = "yes"; then
+@@ -4175,10 +4179,12 @@
fi
# Install the pseudo-library for information purposes.
Index: files/patch-scripts::test::test.fe
===================================================================
RCS file: /home/ncvs/ports/lang/ferite/files/patch-scripts::test::test.fe,v
retrieving revision 1.1
diff -u -r1.1 patch-scripts::test::test.fe
--- files/patch-scripts::test::test.fe 14 Oct 2001 14:45:04 -0000 1.1
+++ files/patch-scripts::test::test.fe 16 Nov 2001 01:00:28 -0000
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
--- scripts/test/test.fe.orig Thu Jul 26 01:10:56 2001
-+++ scripts/test/test.fe Sun Aug 26 00:06:31 2001
++++ scripts/test/test.fe Thu Nov 15 18:53:41 2001
@@ -17,17 +17,17 @@
a_global_int = 10;
testfile = new File();
@@ -16,11 +19,11 @@
- (\/[a-z]*(\/[a-z]*)*) # mount point
- [\ \t]* # whitespace
- ext2 # force adherance to ext2
-+ (\/dev\/[ad][ad][0-9]s[1-4][a-h]) # device entry
-+ [\ \t]* # whitespace
-+ (\/[a-z]*(\/[a-z]*)*) # mount point
-+ [\ \t]* # whitespace
-+ ufs # force adherance to ext2
++ (\/dev\/[adw][ad][0-9][0-9]?s?[1-4]?[a-h]) # device entry
++ [\ \t]* # whitespace
++ (\/[a-z]*(\/[a-z]*)*) # mount point
++ [\ \t]* # whitespace
++ ufs # force adherance to ufs
/xoi /* make usre it's not case sensitive */
)
{
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200111160205.fAG252T53296>