diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-03-28 00:15:26 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-03-28 00:15:26 +0000 |
commit | 896c03e8702872b6baa1f47494099f0188d07d88 (patch) | |
tree | 5468741b8e735795c99313cae7b8117c66c34910 /misc | |
parent | Add missing driver and bump PORTREVISION (diff) |
Update to 1.3.r1
PR: 36378
Submitted by: Li-lun Wang (Leland Wang) <llwang@infor.org>
Notes
Notes:
svn path=/head/; revision=56763
Diffstat (limited to 'misc')
-rw-r--r-- | misc/bb/Makefile | 28 | ||||
-rw-r--r-- | misc/bb/distinfo | 2 | ||||
-rw-r--r-- | misc/bb/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | misc/bb/files/patch-aa | 11 | ||||
-rw-r--r-- | misc/bb/files/patch-ab | 30 | ||||
-rw-r--r-- | misc/bb/files/patch-ac | 11 | ||||
-rw-r--r-- | misc/bb/files/patch-ad | 11 | ||||
-rw-r--r-- | misc/bb/pkg-plist | 3 |
8 files changed, 20 insertions, 87 deletions
diff --git a/misc/bb/Makefile b/misc/bb/Makefile index 3a76ebc1094a..b9d0b7ff0e82 100644 --- a/misc/bb/Makefile +++ b/misc/bb/Makefile @@ -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 --git a/misc/bb/distinfo b/misc/bb/distinfo index 8e76aa8b44ff..57bfbb209b8d 100644 --- a/misc/bb/distinfo +++ b/misc/bb/distinfo @@ -1 +1 @@ -MD5 (bb-1.2.tar.gz) = 1c5c2777900002beb247ce6ec7c5f2bc +MD5 (bb-1.3rc1.tar.gz) = 1ae5b742fbe654ba51c31832cf7e81fd diff --git a/misc/bb/files/patch-Makefile.in b/misc/bb/files/patch-Makefile.in new file mode 100644 index 000000000000..c879f23a6657 --- /dev/null +++ b/misc/bb/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed Mar 27 19:09:08 2002 ++++ Makefile.in Wed Mar 27 19:08:58 2002 +@@ -87,7 +87,7 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ $(LIBMIKMOD_LDADD) + bb_OBJECTS = autopilo.o backconv.o bb.o credits.o credits2.o ctrl87.o \ + fk1.o fk2.o fk3.o fk4.o formulas.o hh1.o hh2.o hh3.o hh4.o image.o \ + julia.o kt1.o kt2.o kt3.o kt4.o main.o messager.o minilzo.o ms1.o ms2.o \ diff --git a/misc/bb/files/patch-aa b/misc/bb/files/patch-aa deleted file mode 100644 index dac129fe54ea..000000000000 --- a/misc/bb/files/patch-aa +++ /dev/null @@ -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 --git a/misc/bb/files/patch-ab b/misc/bb/files/patch-ab deleted file mode 100644 index 54eadd76b160..000000000000 --- a/misc/bb/files/patch-ab +++ /dev/null @@ -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 --git a/misc/bb/files/patch-ac b/misc/bb/files/patch-ac deleted file mode 100644 index aa005ff2c116..000000000000 --- a/misc/bb/files/patch-ac +++ /dev/null @@ -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 --git a/misc/bb/files/patch-ad b/misc/bb/files/patch-ad deleted file mode 100644 index 355aa931bef3..000000000000 --- a/misc/bb/files/patch-ad +++ /dev/null @@ -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 --git a/misc/bb/pkg-plist b/misc/bb/pkg-plist index 310d5a4b6b1a..fda7598757c0 100644 --- a/misc/bb/pkg-plist +++ b/misc/bb/pkg-plist @@ -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 |