From nobody@FreeBSD.org  Sat Mar  2 20:29:11 2002
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 6569537B400
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Mar 2002 20:29:11 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g234TBn57871;
	Sat, 2 Mar 2002 20:29:11 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200203030429.g234TBn57871@freefall.freebsd.org>
Date: Sat, 2 Mar 2002 20:29:11 -0800 (PST)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: net/librsync
X-Send-Pr-Version: www-1.0

>Number:         35498
>Category:       ports
>Synopsis:       Update port: net/librsync
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 02 20:30:04 PST 2002
>Closed-Date:    Sat Mar 2 22:44:12 PST 2002
>Last-Modified:  Sat Mar 02 22:44:21 PST 2002
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Do not install useless .la files

New file:
files/patch-ltmain.sh

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/net/librsync/Makefile net/librsync/Makefile
--- /usr/ports/net/librsync/Makefile	Mon Sep 17 19:02:08 2001
+++ net/librsync/Makefile	Sat Mar  2 15:41:20 2002
@@ -8,6 +8,7 @@
 
 PORTNAME=	librsync
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rproxy
@@ -19,18 +20,14 @@
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--enable-shared --disable-trace
-
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-shared --disable-trace
 INSTALLS_SHLIB=	yes
 
 MAN1=	rdiff.1
 MAN3=	librsync.3
-
-pre-build:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/net/librsync/files/patch-ltmain.sh net/librsync/files/patch-ltmain.sh
--- /usr/ports/net/librsync/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
+++ net/librsync/files/patch-ltmain.sh	Sat Mar  2 15:45:22 2002
@@ -0,0 +1,42 @@
+--- ltmain.sh.orig	Fri Sep  7 03:45:46 2001
++++ ltmain.sh	Sat Mar  2 15:45:11 2002
+@@ -1040,7 +1040,7 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+@@ -1048,7 +1048,7 @@
+ 	 fi
+ 	 if test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2439,7 +2439,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4208,10 +4208,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -urN /usr/ports/net/librsync/pkg-plist net/librsync/pkg-plist
--- /usr/ports/net/librsync/pkg-plist	Mon Sep 17 19:02:09 2001
+++ net/librsync/pkg-plist	Sat Mar  2 15:41:09 2002
@@ -1,6 +1,5 @@
 bin/rdiff
 include/rsync.h
 lib/librsync.a
-lib/librsync.la
 lib/librsync.so
 lib/librsync.so.1

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Sat Mar 2 22:44:12 PST 2002 
State-Changed-Why:  
Committed, Thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=35498 
>Unformatted:
