From owner-freebsd-ports Tue Feb 5 20: 0:23 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B24F537B428 for ; Tue, 5 Feb 2002 20:00:08 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g16408X01869; Tue, 5 Feb 2002 20:00:08 -0800 (PST) (envelope-from gnats) Received: from shumai.marcuscom.com (rdu57-28-046.nc.rr.com [66.57.28.46]) by hub.freebsd.org (Postfix) with ESMTP id 2714F37B421 for ; Tue, 5 Feb 2002 19:55:56 -0800 (PST) Received: (from marcus@localhost) by shumai.marcuscom.com (8.11.6/8.11.6) id g163u5L09539; Tue, 5 Feb 2002 22:56:05 -0500 (EST) (envelope-from marcus) Message-Id: <200202060356.g163u5L09539@shumai.marcuscom.com> Date: Tue, 5 Feb 2002 22:56:05 -0500 (EST) From: Joe Marcus Clarke Reply-To: Joe Marcus Clarke To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/34653: [PATCH] Update www/galeon to 1.0.3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 34653 >Category: ports >Synopsis: [PATCH] Update www/galeon to 1.0.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Feb 05 20:00:08 PST 2002 >Closed-Date: >Last-Modified: >Originator: Joe Marcus Clarke >Release: FreeBSD 4.5-STABLE i386 >Organization: MarcusCom, Inc. >Environment: System: FreeBSD shumai.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Sat Feb 2 17:21:37 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386 >Description: Update the galeon port to 1.0.3. Doesn't look like much changed. I didn't quite see the need for defining the AUTO* macros to true. The port compiled, and runs fine on -stable. >How-To-Repeat: >Fix: --- Makefile.orig Tue Feb 5 18:55:09 2002 +++ Makefile Tue Feb 5 18:40:22 2002 @@ -6,7 +6,7 @@ # PORTNAME= galeon -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -60,8 +60,9 @@ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' - @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ - 's|iconv\.h|giconv.h|g' + @find ${WRKSRC} -name "*.[ch]" -o -name "*.cpp" | xargs ${PERL} -pi -e \ + 's|malloc\.h|stdlib.h|g ; \ + s|iconv\.h|giconv.h|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ --- distinfo.orig Tue Feb 5 18:55:20 2002 +++ distinfo Tue Feb 5 17:57:07 2002 @@ -1 +1 @@ -MD5 (galeon-1.0.2.tar.gz) = f65a0461fcf7bf1026ff4c4288653849 +MD5 (galeon-1.0.3.tar.gz) = 104a3a684d7598124a3e79aa1830508e --- files/patch-ab.orig Tue Feb 5 18:55:42 2002 +++ files/patch-ab Tue Feb 5 18:56:05 2002 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/www/galeon/files/patch-ab,v 1.14 2001/12/28 09:34:18 sobomax Exp $ - ---- src/galeon.in.orig Thu Dec 27 23:49:08 2001 -+++ src/galeon.in Fri Dec 28 10:58:16 2001 +--- src/galeon.in.orig Thu Dec 27 19:07:23 2001 ++++ src/galeon.in Tue Feb 5 18:04:21 2002 @@ -4,18 +4,14 @@ if test -n "$MOZILLA_FIVE_HOME"; then @@ -21,11 +18,11 @@ -elif [ -f /opt/gnome/lib/mozilla/chrome/comm.jar ]; then - MOZILLA_HOME=/opt/gnome/lib/mozilla/ +elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then -+ MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%% ++ MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%% +elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then -+ MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% ++ MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% +elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then -+ MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%% ++ MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%% else echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory" exit --- files/patch-configure.orig Tue Feb 5 18:55:53 2002 +++ files/patch-configure Tue Feb 5 18:56:07 2002 @@ -1,19 +1,16 @@ - -$FreeBSD: ports/www/galeon/files/patch-configure,v 1.5 2001/11/19 13:41:39 sobomax Exp $ - ---- configure.orig Mon Nov 19 14:20:52 2001 -+++ configure Mon Nov 19 14:21:50 2001 -@@ -6182,7 +6182,7 @@ +--- configure.orig Tue Feb 5 18:08:06 2002 ++++ configure Tue Feb 5 18:11:05 2002 +@@ -13087,7 +13087,7 @@ + echo "${ECHO_T}no" >&6 fi - - CATOBJEXT=.gmo + CATOBJEXT=.mo fi - - else -@@ -6304,7 +6304,7 @@ - + + fi +@@ -13213,7 +13213,7 @@ + BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo @@ -21,7 +18,7 @@ INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi -@@ -6389,7 +6389,7 @@ +@@ -13306,7 +13306,7 @@ fi for lang in $ALL_LINGUAS; do @@ -30,18 +27,3 @@ POFILES="$POFILES $lang.po" done -@@ -6755,10 +6755,10 @@ - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@PACKAGE@%$PACKAGE%g - s%@VERSION@%$VERSION%g --s%@ACLOCAL@%$ACLOCAL%g --s%@AUTOCONF@%$AUTOCONF%g --s%@AUTOMAKE@%$AUTOMAKE%g --s%@AUTOHEADER@%$AUTOHEADER%g -+s%@ACLOCAL@%/usr/bin/true%g -+s%@AUTOCONF@%/usr/bin/true%g -+s%@AUTOMAKE@%/usr/bin/true%g -+s%@AUTOHEADER@%/usr/bin/true%g - s%@MAKEINFO@%$MAKEINFO%g - s%@SET_MAKE@%$SET_MAKE%g - s%@host@%$host%g >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message