Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Jan 2002 20:49:27 +0100 (CET)
From:      Dag-Erling Smorgrav <des@des.thinksec.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/34044: Update to textproc/sablotron
Message-ID:  <20020118194927.48ED955BB@des.thinksec.com>

next in thread | raw e-mail | index | archive | help

>Number:         34044
>Category:       ports
>Synopsis:       Update to textproc/sablotron
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 18 11:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Dag-Erling Smorgrav
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD des.thinksec.com 5.0-CURRENT FreeBSD 5.0-CURRENT #124: Sat Jan 12 19:11:47 CET 2002 des@des.thinksec.com:/usr/src/sys/i386/compile/DES i386

>Description:

The textproc/sablotron port installs Sablotron 0.71.  The current release
from the Ginger Alliance is 0.81.

>How-To-Repeat:

# porteasy -bu textproc/sablotron

>Fix:

Apply the patch below.  Note that I am unsure whether SHLIB_MAJOR should
remain at 66, or increase (maybe to 81?).

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	6 Jan 2002 06:20:22 -0000	1.12
+++ Makefile	18 Jan 2002 19:37:54 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Sablot
-PORTVERSION=	0.71
+PORTVERSION=	0.81
 CATEGORIES=	textproc
 MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
 
@@ -20,14 +20,16 @@
 SHLIB_MAJOR=	66
 PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib \
+		LIBTOOL=${LIBTOOL}
 
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
 AUTOMAKE_ARGS=	-a
 USE_LIBTOOL=	yes
 
-pre-patch:
+post-patch:
 		@${PERL} -pi -e \
 		's!(?<=libsablot_la_LDFLAGS = -version-info )(\d+):(\d+):\1!${SHLIB_MAJOR}:$$1:${SHLIB_MAJOR}!;' \
 		${WRKSRC}/src/engine/Makefile.am
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	2 Dec 2001 18:40:48 -0000	1.9
+++ distinfo	18 Jan 2002 18:55:34 -0000
@@ -1 +1 @@
-MD5 (Sablot-0.71.tar.gz) = 5c5436b5b3c28f79e9d7f3bfddff5948
+MD5 (Sablot-0.81.tar.gz) = 830c90d751d1bc9fe85e93013f03477c
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist	2 Dec 2001 18:40:48 -0000	1.7
+++ pkg-plist	18 Jan 2002 19:44:50 -0000
@@ -4,5 +4,6 @@
 include/shandler.h
 include/sxpath.h
 lib/libsablot.a
+lib/libsablot.la
 lib/libsablot.so
 lib/libsablot.so.%%SHLIB_MAJOR%%
Index: files/patch-aa
===================================================================
RCS file: files/patch-aa
diff -N files/patch-aa
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-aa	18 Jan 2002 19:37:02 -0000
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig	Fri Jan 18 20:36:47 2002
++++ aclocal.m4	Fri Jan 18 20:37:00 2002
+@@ -135,7 +135,8 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="${LIBTOOL}"
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion


>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?20020118194927.48ED955BB>