From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 23 05:50:21 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 EB14C16A4CF for ; Sun, 23 Nov 2003 05:50:21 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F146843F93 for ; Sun, 23 Nov 2003 05:50:13 -0800 (PST) (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 hANDoDFY004749 for ; Sun, 23 Nov 2003 05:50:13 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hANDoDJw004748; Sun, 23 Nov 2003 05:50:13 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 23 Nov 2003 05:50:13 -0800 (PST) Resent-Message-Id: <200311231350.hANDoDJw004748@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, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EF8516A4CE for ; Sun, 23 Nov 2003 05:45:30 -0800 (PST) Received: from hfep08.dion.ne.jp (hfep08.dion.ne.jp [203.181.105.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23C7E43FAF for ; Sun, 23 Nov 2003 05:45:29 -0800 (PST) (envelope-from tkato@prontomail.com) Received: from localhost ([218.222.68.9]) by hfep08.dion.ne.jp with SMTP id <20031123134524654.FBJE@hfep08.dion.ne.jp> for ; Sun, 23 Nov 2003 22:45:24 +0900 Message-Id: <20031123224504.6e793f90.tkato@prontomail.com> Date: Sun, 23 Nov 2003 22:45:04 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59609: Update port: emulators/bfe to 20030723 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2003 13:50:22 -0000 X-List-Received-Date: Sun, 23 Nov 2003 13:50:22 -0000 X-List-Received-Date: Sun, 23 Nov 2003 13:50:22 -0000 X-List-Received-Date: Sun, 23 Nov 2003 13:50:22 -0000 >Number: 59609 >Category: ports >Synopsis: Update port: emulators/bfe to 20030723 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 23 05:50:13 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: >Description: - Update to version 20030723 Remove file: files/patch-configure.sh >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/bfe/Makefile emulators/bfe/Makefile --- /usr/ports/emulators/bfe/Makefile Mon Nov 3 14:23:58 2003 +++ emulators/bfe/Makefile Sun Nov 23 22:05:27 2003 @@ -6,36 +6,46 @@ # PORTNAME= bfe2 -PORTVERSION= 20030124 +PORTVERSION= 20030723 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bfe -DISTNAME= bfe2-24jan2003 +DISTNAME= ${PORTNAME}-23jul2003 MAINTAINER= ports@FreeBSD.org COMMENT= X11 GUI for the bochs debugger (revision 2) RUN_DEPENDS= bochs:${PORTSDIR}/emulators/bochs -USE_REINPLACE= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + USE_X_PREFIX= yes -USE_GNOME= gtk12 +USE_REINPLACE= yes +HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh -WRKSRC= ${WRKDIR}/bfe2 -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ - -e 's|%%CC%%|${CC}|' -e 's|%%CFLAGS%%|${CFLAGS}|' \ - -e 's|gtk-config|${GTK_CONFIG}|' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} +.if defined(WITH_GTK2) +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --gtk 2.0 +PKGNAMESUFFIX= -gtk2 +.else +USE_GNOME+= gtk12 +CONFIGURE_ARGS+= --gtk 1.2 +.endif -do-configure: - @cd ${WRKSRC} && ${SH} ${CONFIGURE_SCRIPT} +post-patch: + @${REINPLACE_CMD} -e \ + 's|%%CFLAGS%%|"${CFLAGS}"|g ; \ + s|%%CC%%|"${CC}"|g ; \ + s|%%PREFIX%%|"${PREFIX}"|g ; \ + s|gtk-config --libs|pkg-config --libs gtk+|g ; \ + s|gtk-config --cflags|pkg-config --cflags gtk+|g' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bfe2 ${PREFIX}/bin - -@${MKDIR} ${PREFIX}/share/bfe - ${INSTALL_DATA} ${WRKSRC}/README.bferc ${PREFIX}/share/bfe/bferc.sample - ${INSTALL_DATA} ${WRKSRC}/README.bferc ${PREFIX}/share/bfe + @${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/README.bferc ${DATADIR}/bferc.sample + ${INSTALL_DATA} ${WRKSRC}/README.bferc ${DATADIR} .include diff -urN /usr/ports/emulators/bfe/distinfo emulators/bfe/distinfo --- /usr/ports/emulators/bfe/distinfo Wed Apr 16 12:08:36 2003 +++ emulators/bfe/distinfo Sun Nov 23 21:47:37 2003 @@ -1 +1 @@ -MD5 (bfe2-24jan2003.tar.gz) = 83018142b4d30ba13def376f4996d845 +MD5 (bfe2-23jul2003.tar.gz) = 668837b5ce1a03f6a589a7331daadf17 diff -urN /usr/ports/emulators/bfe/files/patch-configure.sh emulators/bfe/files/patch-configure.sh --- /usr/ports/emulators/bfe/files/patch-configure.sh Wed Apr 16 04:54:08 2003 +++ emulators/bfe/files/patch-configure.sh Thu Jan 1 09:00:00 1970 @@ -1,49 +0,0 @@ ---- configure.sh.orig Sat Jan 25 07:08:39 2003 -+++ configure.sh Thu Feb 6 02:11:55 2003 -@@ -1,26 +1,18 @@ --#!/bin/bash -- --# csh and tcsh do not like this file --# ash produces incorrect quoting -- --if [ "`/bin/ls -la /bin/sh |grep '\-> ash'`" != "" ]; then -- echo -e "\nash shell is not supported\n" -- exit --fi -+#!/bin/sh - - ############################################################################## - --CC="cc" --LD="cc" --CFLAGS="-O2 -Wall" -+CC=%%CC%% -+LD=%%CC%% -+CFLAGS=%%CFLAGS%% - LFLAGS="" - - PROG="bfe2" - OWNER="root" --GROUP="root" -+GROUP="whell" - - # install directories --PREFIX="/usr/local" -+PREFIX=%%PREFIX%% - BIN="bin" - SYSCONF="etc" - -@@ -106,13 +98,6 @@ - INCS="\`pkg-config --cflags gtk+-2.0\`" - else - echo -e "\tInvalid GTK version [$GTK]" -- exit --fi -- --if [ "$BOCHS" == "2.0" ]; then -- BOCHSPATH="$BOCHSPATH -q" --else -- echo -e "\tInvalid Bochs version [$BOCHS]" - exit - fi - diff -urN /usr/ports/emulators/bfe/pkg-plist emulators/bfe/pkg-plist --- /usr/ports/emulators/bfe/pkg-plist Wed Apr 16 12:08:36 2003 +++ emulators/bfe/pkg-plist Sun Nov 23 21:53:34 2003 @@ -1,4 +1,4 @@ bin/bfe2 -share/bfe/bferc.sample -share/bfe/README.bferc -@dirrm share/bfe +%%DATADIR%%/bferc.sample +%%DATADIR%%/README.bferc +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: