From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 29 13:30:05 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7163F37B401 for ; Sun, 29 Jun 2003 13:30:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAEC743FB1 for ; Sun, 29 Jun 2003 13:30:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5TKU4Up020718 for ; Sun, 29 Jun 2003 13:30:04 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5TKU4HR020717; Sun, 29 Jun 2003 13:30:04 -0700 (PDT) Resent-Date: Sun, 29 Jun 2003 13:30:04 -0700 (PDT) Resent-Message-Id: <200306292030.h5TKU4HR020717@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rui Lopes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8628137B404 for ; Sun, 29 Jun 2003 13:23:24 -0700 (PDT) Received: from ns.webtt.biz (ns.webtt.biz [64.239.29.225]) by mx1.FreeBSD.org (Postfix) with SMTP id 72D2143FF9 for ; Sun, 29 Jun 2003 13:23:23 -0700 (PDT) (envelope-from root@ns.webtt.biz) Received: (qmail 61910 invoked by uid 0); 29 Jun 2003 20:25:41 -0000 Message-Id: <20030629202541.61909.qmail@ns.webtt.biz> Date: 29 Jun 2003 20:25:41 -0000 From: Rui Lopes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53905: [PATCH] for updating devel/devhelp to 0.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rui Lopes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 20:30:05 -0000 >Number: 53905 >Category: ports >Synopsis: [PATCH] for updating devel/devhelp to 0.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 29 13:30:04 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Rui Lopes >Release: FreeBSD 5.1-RELEASE i386 >Organization: >Environment: System: FreeBSD disty 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Fri Jun 6 19:30:44 WEST 2003 root@disty:/usr/obj/usr/src/sys/DEBUGGER i386 >Description: Update to devhelp 0.7 and update WWW link. >How-To-Repeat: >Fix: --- devhelp.diff begins here --- diff -ruN devhelp.orig/Makefile devhelp/Makefile --- devhelp.orig/Makefile Sun Jun 29 13:04:07 2003 +++ devhelp/Makefile Sun Jun 29 21:17:31 2003 @@ -6,11 +6,10 @@ # PORTNAME= devhelp -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.7 CATEGORIES?= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7 DIST_SUBDIR= gnome2 MAINTAINER= rui@ruilopes.com @@ -20,7 +19,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libgtkhtml libgnomeui -USE_LIBTOOL= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff -ruN devhelp.orig/distinfo devhelp/distinfo --- devhelp.orig/distinfo Sun Jun 29 13:04:07 2003 +++ devhelp/distinfo Sun Jun 29 13:10:40 2003 @@ -1 +1 @@ -MD5 (gnome2/devhelp-0.6.0.tar.bz2) = 550483a3717f8bc58d0f3bfdab57413f +MD5 (gnome2/devhelp-0.7.tar.bz2) = 7391578353368d9db3ed6a74f4128754 diff -ruN devhelp.orig/files/patch-configure devhelp/files/patch-configure --- devhelp.orig/files/patch-configure Sun Jun 29 13:04:07 2003 +++ devhelp/files/patch-configure Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- configure.orig Thu May 29 02:11:26 2003 -+++ configure Thu May 29 02:12:44 2003 -@@ -7639,6 +7639,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff -ruN devhelp.orig/files/patch-ltmain.sh devhelp/files/patch-ltmain.sh --- devhelp.orig/files/patch-ltmain.sh Thu Jan 1 01:00:00 1970 +++ devhelp/files/patch-ltmain.sh Sun Jun 29 21:03:19 2003 @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sun Jun 29 11:51:47 2003 ++++ ltmain.sh Sun Jun 29 21:02:37 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,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 -ruN devhelp.orig/files/patch-src::dh-base.c devhelp/files/patch-src::dh-base.c --- devhelp.orig/files/patch-src::dh-base.c Sun Jun 29 13:04:07 2003 +++ devhelp/files/patch-src::dh-base.c Sun Jun 29 13:42:04 2003 @@ -1,10 +1,10 @@ ---- src/dh-base.c.orig Tue Jun 3 12:21:34 2003 -+++ src/dh-base.c Tue Jun 3 12:23:04 2003 -@@ -155,6 +155,7 @@ +--- src/dh-base.c.orig Sat Jun 28 22:16:34 2003 ++++ src/dh-base.c Sun Jun 29 13:40:23 2003 +@@ -222,6 +222,7 @@ - /* Insert the books from default gtk-doc install path */ - base_add_books (base, DATADIR"/gtk-doc/html"); -+ base_add_books (base, DATADIR"/../doc"); // FreeBSD default doc path + /* Insert the books from default gtk-doc install path. */ + base_add_books (base, DATADIR "/gtk-doc/html"); ++ base_add_books (base, DATADIR "/../doc"); // FreeBSD default doc path base_add_books (base, "/usr/share/gtk-doc/html"); - base_add_books (base, DATADIR"/devhelp/books"); - dir = g_strconcat (g_getenv ("HOME"), "/.devhelp/books", NULL); + base_add_books (base, DATADIR "/devhelp/books"); + dir = g_build_filename (g_get_home_dir (), ".devhelp", "books", NULL); diff -ruN devhelp.orig/pkg-descr devhelp/pkg-descr --- devhelp.orig/pkg-descr Sun Jun 29 13:04:07 2003 +++ devhelp/pkg-descr Sun Jun 29 13:03:33 2003 @@ -3,6 +3,6 @@ easily searchable information. Many books are available, and can be found through the project's website. -WWW: http://devhelp.codefactory.se +WWW: http://www.imendio.com/projects/devhelp/ -Adam Weinberger --- devhelp.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: