From owner-freebsd-ports Sat Mar 18 13:50:13 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id E608637BBDB for ; Sat, 18 Mar 2000 13:50:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA94531; Sat, 18 Mar 2000 13:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from rock.ghis.net (rock.ghis.net [209.222.164.7]) by hub.freebsd.org (Postfix) with ESMTP id 59CB837B65C for ; Sat, 18 Mar 2000 13:42:01 -0800 (PST) (envelope-from root@blackdawn.com) Received: from shadow.blackdawn.com (postfix@23-149.008.popsite.net [209.69.197.149] (may be forged)) by rock.ghis.net (8.9.3/8.9.3) with ESMTP id NAA04710 for ; Sat, 18 Mar 2000 13:40:19 -0800 (PST) Received: by shadow.blackdawn.com (Postfix, from userid 0) id 682E31B12; Sat, 18 Mar 2000 16:40:11 -0500 (EST) Message-Id: <20000318214011.682E31B12@shadow.blackdawn.com> Date: Sat, 18 Mar 2000 16:40:11 -0500 (EST) From: Will Andrews Reply-To: Will Andrews To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/17477: update port: www/screem: 0.1.92 -> 0.2.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17477 >Category: ports >Synopsis: update port: www/screem: 0.1.92 -> 0.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 18 13:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Will Andrews >Release: FreeBSD 3.4-STABLE i386, FreeBSD 5.0-CURRENT i386 >Organization: none >Environment: FreeBSD shadow.blackdawn.com 3.4-STABLE FreeBSD 3.4-STABLE #0: Sun Jan 23 13:41:02 EST 2000 root@shadow.blackdawn.com:/usr/src/sys/compile/SHADOW i386 FreeBSD argon.blackdawn.com 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Thu Mar 16 06:55:19 EST 2000 root@argon.blackdawn.com:/usr/src/sys/compile/KRYPTON i386 >Description: Update for SCREEM (0.2.1). Status: 1) Removes pth-devel dependency. I discovered that -pthread works too. In the process of testing a previous update, I also discovered that if you have linuxthreads installed (as I did on my -current box), it will use -lpthread instead of -pthread. So I had to patch configure further to make sure that we don't get "lost dependencies" down the road. 2) Adds USE_LIBTOOL like it's supposed to.. 3) Shuffles the pkg/PLIST around a bit. 4) New (and faster) MASTER_SITE. 5) New patch (patches/patch-ac) to patch uploadWizard Makefile.in so it won't hardcode -lpthread. Forgotten by: myself Prompted by: Mikhail Teterin >How-To-Repeat: Use the diff below to fix the current port. >Fix: Index: Makefile =================================================================== RCS file: /extra/cvsroot/ports/www/screem/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 1999/12/27 02:18:02 1.1 +++ Makefile 2000/03/18 20:59:26 @@ -1,21 +1,22 @@ # New ports collection makefile for: SCREEM -# Version required: 0.1.92 +# Version required: 0.2.1 # Date created: 05 Nov 1999 # Whom: Will Andrews # # $FreeBSD: ports/www/screem/Makefile,v 1.1 1999/12/27 02:18:02 steve Exp $ # -DISTNAME= screem-0.1.92 +DISTNAME= screem-0.2.1 CATEGORIES= www -MASTER_SITES= http://www.screem.org/src/ +MASTER_SITES= ftp://download.sourceforge.net/pub/sourceforge/screem/ \ + http://www.screem.org/src/ MAINTAINER= andrews@technologist.com -LIB_DEPENDS= glade.2:${PORTSDIR}/devel/libglade \ - pthread.13:${PORTSDIR}/devel/pth-devel +LIB_DEPENDS= glade.2:${PORTSDIR}/devel/libglade LIBGLADE_CONFIG?= ${LOCALBASE}/bin/libglade-config +USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_X_PREFIX= yes Index: files/md5 =================================================================== RCS file: /extra/cvsroot/ports/www/screem/files/md5,v retrieving revision 1.1 diff -u -r1.1 md5 --- files/md5 1999/12/27 02:18:04 1.1 +++ files/md5 2000/03/18 20:59:26 @@ -1 +1 @@ -MD5 (screem-0.1.92.tar.gz) = a453d71ddb2cb751cad3dbb0948514e2 +MD5 (screem-0.2.1.tar.gz) = 37a39c59e34399a13455b759e03e8eeb Index: patches/patch-ab =================================================================== RCS file: /extra/cvsroot/ports/www/screem/patches/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- patches/patch-ab 1999/12/27 02:18:05 1.1 +++ patches/patch-ab 2000/03/18 21:26:53 @@ -1,6 +1,74 @@ ---- configure Thu Oct 28 15:09:16 1999 -+++ configure.new Sat Nov 13 15:01:06 1999 -@@ -5686,7 +5686,7 @@ +--- configure Mon Jan 3 09:33:01 2000 ++++ configure.new Sat Mar 18 16:23:46 2000 +@@ -1922,8 +1922,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 $host \ ++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + # Reload cache, that may have been modified by ltconfig +@@ -1937,7 +1937,7 @@ + + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -2405,6 +2405,7 @@ + fi + + ++if false; then + PTHREAD_LIB="" + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 + echo "configure:2411: checking for pthread_create in -lpthread" >&5 +@@ -2482,6 +2483,9 @@ + PTHREAD_LIB="-lpthreads" + else + echo "$ac_t""no" 1>&6 ++fi ++fi ++fi + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 + echo "configure:2487: checking for pthread_create in -lc_r" >&5 + ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` +@@ -2489,7 +2493,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lc_r $LIBS" ++LIBS="-pthread $LIBS" + cat > conftest.$ac_ext <&6 +- PTHREAD_LIB="-lc_r" ++ PTHREAD_LIB="-pthread" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 +@@ -2571,11 +2575,6 @@ + + fi + +- +-fi +- +- +-fi + + + +@@ -5882,7 +5881,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo Index: pkg/PLIST =================================================================== RCS file: /extra/cvsroot/ports/www/screem/pkg/PLIST,v retrieving revision 1.1 diff -u -r1.1 PLIST --- pkg/PLIST 1999/12/27 02:18:07 1.1 +++ pkg/PLIST 2000/03/18 20:59:26 @@ -6,6 +6,7 @@ share/locale/de/LC_MESSAGES/screem.mo share/locale/fr/LC_MESSAGES/screem.mo share/locale/pl/LC_MESSAGES/screem.mo +share/screem/glade/css.glade share/screem/glade/extern_browsers.glade share/screem/glade/imageWizard.glade share/screem/glade/linkWizard.glade @@ -16,25 +17,16 @@ share/screem/glade/sitetemplate.glade share/screem/glade/todo.glade share/screem/plugins/colourWizard.a -share/screem/plugins/colourWizard.la +share/screem/plugins/cssWizard.a share/screem/plugins/entityWizard.a -share/screem/plugins/entityWizard.la share/screem/plugins/externBrowsers.a -share/screem/plugins/externBrowsers.la share/screem/plugins/galleryWizard.a -share/screem/plugins/galleryWizard.la share/screem/plugins/imageWizard.a -share/screem/plugins/imageWizard.la share/screem/plugins/linkWizard.a -share/screem/plugins/linkWizard.la share/screem/plugins/mailWizard.a -share/screem/plugins/mailWizard.la share/screem/plugins/ssiWizard.a -share/screem/plugins/ssiWizard.la share/screem/plugins/tableWizard.a -share/screem/plugins/tableWizard.la share/screem/plugins/uploadWizard.a -share/screem/plugins/uploadWizard.la share/screem/screem.tagtree share/screem/splash/1.png share/screem/splash/2.png @@ -42,5 +34,10 @@ share/screem/splash/4.png @dirrm share/screem/glade @dirrm share/screem/plugins +@dirrm share/screem/resources/Applets +@dirrm share/screem/resources/Images +@dirrm share/screem/resources/Javascript +@dirrm share/screem/resources/PHP3 +@dirrm share/screem/resources @dirrm share/screem/splash @dirrm share/screem --- /dev/null Sat Mar 18 16:36:31 2000 +++ patches/patch-ac Sat Mar 18 16:26:20 2000 @@ -0,0 +1,11 @@ +--- plugins/uploadWizard/Makefile.in Mon Jan 3 09:34:07 2000 ++++ plugins/uploadWizard/Makefile.in.new Sat Mar 18 16:25:24 2000 +@@ -151,7 +151,7 @@ + + + uploadWizard_la_LDFLAGS = -avoid-version -module +-uploadWizard_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lpthread ++uploadWizard_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) @PTHREAD_LIB@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h + CONFIG_CLEAN_FILES = >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message