Date: Thu, 28 Mar 2002 02:47:51 +0800 (CST) From: Li-lun Wang (Leland Wang) <llwang@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36378: Update port: misc/bb Update to 1.3rc1 to fix the BROKEN Message-ID: <200203271847.g2RIlpt45358@leland.infor.org>
next in thread | raw e-mail | index | archive | help
>Number: 36378 >Category: ports >Synopsis: Update port: misc/bb Update to 1.3rc1 to fix the BROKEN >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 27 10:50:02 PST 2002 >Closed-Date: >Last-Modified: >Originator: Li-lun Wang (Leland Wang) >Release: FreeBSD 4.5-STABLE i386 >Organization: National Taiwan University >Environment: System: FreeBSD leland.infor.org 4.5-STABLE FreeBSD 4.5-STABLE #0: Sat Mar 9 23:16:49 CST 2002 llwang@leland.infor.org:/home/mp3/obj/usr/src/sys/LELAND i386 >Description: BB has to be updated to 1.3 so that it will build with aalib 1.4. >How-To-Repeat: >Fix: diff -urN bb.orig/Makefile bb/Makefile --- bb.orig/Makefile Thu Mar 28 02:24:33 2002 +++ bb/Makefile Thu Mar 28 02:36:22 2002 @@ -6,39 +6,27 @@ # PORTNAME= bb -PORTVERSION= 1.2 +PORTVERSION= 1.3.r1 CATEGORIES= misc -MASTER_SITES= ftp://ftp.ta.jcu.cz/pub/aa/bb/ \ - ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= games +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= aa-project +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= ports@FreeBSD.org -BROKEN= "Does not build" - LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib -MAKEFILE= makefile GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/bb-1.3.0 +MAN1= bb.1 pre-patch: ${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e "s@#include +<malloc.h>@#include <stdlib.h>@g" -pre-build: - @ cd ${WRKSRC}/mikunix; make - -do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/bb ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/bb_snd_server ${PREFIX}/bin - @ ${MKDIR} ${PREFIX}/share/bb -.for file in bb bb2 bb3 - @ ${INSTALL_DATA} ${WRKSRC}/${file}.s3m ${PREFIX}/share/bb -.endfor +post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in ANNOUNCE COPYING README - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.mk> diff -urN bb.orig/distinfo bb/distinfo --- bb.orig/distinfo Thu Nov 30 21:07:59 2000 +++ bb/distinfo Thu Mar 28 02:05:04 2002 @@ -1 +1 @@ -MD5 (bb-1.2.tar.gz) = 1c5c2777900002beb247ce6ec7c5f2bc +MD5 (bb-1.3rc1.tar.gz) = 1ae5b742fbe654ba51c31832cf7e81fd diff -urN bb.orig/files/patch-aa bb/files/patch-aa --- bb.orig/files/patch-aa Thu Nov 30 21:07:59 2000 +++ bb/files/patch-aa Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- unix.c Tue Mar 10 22:42:39 1998 -+++ /home/andy/tmp/wrk/unix.c Mon Jun 22 14:26:36 1998 -@@ -86,7 +86,7 @@ - pid = fork(); - if (pid == (pid_t) 0) { /* This is the child process. */ - char str[256]; -- sprintf(str, "bb_snd_server %i %i %i bb.s3m bb2.s3m bb3.s3m", freq, stereo, _16bit); -+ sprintf(str, "bb_snd_server %i %i %i /usr/local/share/bb/bb.s3m /usr/local/share/bb/bb2.s3m /usr/local/share/bb/bb3.s3m", freq, stereo, _16bit); - close(mypipe[0]); - close(mypipe2[1]); - close(1); diff -urN bb.orig/files/patch-ab bb/files/patch-ab --- bb.orig/files/patch-ab Thu Nov 30 21:07:59 2000 +++ bb/files/patch-ab Thu Jan 1 08:00:00 1970 @@ -1,30 +0,0 @@ ---- mikunix/makefile.orig Mon Mar 2 07:12:26 1998 -+++ mikunix/makefile Mon Apr 12 20:49:06 1999 -@@ -26,7 +26,7 @@ - ############################################################################ - - OSDEF=-DOSS --CC = gcc -+CC ?= gcc - - # if you want to use the Ultra driver uncomment the 3 lines below. - # You need a Gravis Ultrasound and the library from the Linux Ultrasound -@@ -41,7 +41,8 @@ - #ULTRADRV=drv_old.o - - #OSFLAGS = -O3 $(OSDEF) $(ULTRA) --OSFLAGS = -O3 $(OSDEF) -+CFLAGS ?= -O3 -+OSFLAGS = $(OSDEF) - #debug options - #OSFLAGS = -g $(OSDEF) $(ULTRA) - -@@ -174,7 +175,7 @@ - # Does your system have usleep()? If not, you'll need to uncomment this... - #USLEEP=-DNEEDS_USLEEP - --CFLAGS = $(OSFLAGS) $(SNAG) $(USLEEP) -+CFLAGS += $(OSFLAGS) $(SNAG) $(USLEEP) - - ############################################################################ - ############################################################################ diff -urN bb.orig/files/patch-ac bb/files/patch-ac --- bb.orig/files/patch-ac Thu Nov 30 21:07:59 2000 +++ bb/files/patch-ac Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- mikunix/main_ux.c.orig Sun Sep 19 10:52:35 1999 -+++ mikunix/main_ux.c Sun Sep 19 10:53:12 1999 -@@ -73,7 +73,7 @@ - MD_RegisterDriver(&drv_sun); - #elif defined(SOLARIS) - MD_RegisterDriver(&drv_sun); --#elif defined(__alpha) -+#elif defined(__alpha) && !defined(__FreeBSD__) - MD_RegisterDriver(&drv_AF); - #elif defined(OSS) - MD_RegisterDriver(&drv_vox); diff -urN bb.orig/files/patch-ad bb/files/patch-ad --- bb.orig/files/patch-ad Thu Nov 30 21:07:59 2000 +++ bb/files/patch-ad Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- mikunix/mikmod.h.orig Sun Sep 19 10:54:10 1999 -+++ mikunix/mikmod.h Sun Sep 19 10:54:27 1999 -@@ -45,7 +45,7 @@ - #define mikbannerdriver \ - " - Sun/Solaris driver by Valtteri Vuorikoski <vuori@sci.fi>\n" - --#elif defined(__alpha) -+#elif defined(__alpha) && !defined(__FreeBSD__) - #define mikbannerdriver \ - " - AudioFile driver by Roine Gustafsson <e93_rog@e.kth.se>\n" - diff -urN bb.orig/pkg-plist bb/pkg-plist --- bb.orig/pkg-plist Fri Dec 28 01:54:38 2001 +++ bb/pkg-plist Thu Mar 28 02:24:22 2002 @@ -1,10 +1,7 @@ bin/bb -bin/bb_snd_server share/bb/bb.s3m share/bb/bb2.s3m share/bb/bb3.s3m -%%PORTDOCS%%share/doc/bb/ANNOUNCE -%%PORTDOCS%%share/doc/bb/COPYING %%PORTDOCS%%share/doc/bb/README @dirrm share/bb %%PORTDOCS%%@dirrm share/doc/bb >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203271847.g2RIlpt45358>