Date: Thu, 26 Feb 2004 19:05:27 +0100 (CET) From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: pav@FreeBSD.org Subject: ports/63403: [MAINTAINER] audio/squash: update to 1.0 Message-ID: <20040226180527.B56AD1B2AB@merlin.emma.line.org> Resent-Message-ID: <200402261810.i1QIA8gf077536@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63403
>Category: ports
>Synopsis: [MAINTAINER] audio/squash: update to 1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 26 10:10:08 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 5.2-CURRENT FreeBSD 5.2-CURRENT #13: Thu Feb 26 17:13:46 CET 2004
>Description:
- Update to 1.0
- removed files/pkg-message.in
- added files/patch-FIXLOCK-src_global_squash.c
* fixes locking error in upstream 1.0
- the old 1.0pre1 files can be removed from $MASTER_SITE_LOCAL
- clean up pkg-plist
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- squash-1.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/squash/Makefile /root/squash/Makefile
--- /usr/ports/audio/squash/Makefile Wed Feb 4 10:42:13 2004
+++ /root/squash/Makefile Thu Feb 26 18:59:49 2004
@@ -5,15 +5,10 @@
# $FreeBSD: ports/audio/squash/Makefile,v 1.6 2004/02/04 05:18:39 marcus Exp $
PORTNAME= squash
-PORTVERSION= 1.0.p1
-PORTREVISION= 4
+PORTVERSION= 1.0
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= ${PORTNAME} \
- pav/:local
-DISTNAME= squash-1.0pre1
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT,local
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= matthias.andree@gmx.de
COMMENT= Learning console-based MP3/OGG player
@@ -26,23 +21,24 @@
ao.3:${PORTSDIR}/audio/libao
RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3v2
-PKGMESSAGE= ${WRKDIR}/pkg-message
USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_RUBY= yes
+.if !defined(NOPORTDOCS)
+PORTDOCS= *
+.endif
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e "s|--std=gnu99|${CFLAGS} ${PTHREAD_CFLAGS}|; \
+ @${REINPLACE_CMD} -e "s|--std=gnu99|--std=gnu99 ${CFLAGS} ${PTHREAD_CFLAGS}|; \
s|-Iinclude|-Iinclude -I${LOCALBASE}/include|; \
s|-lpthread|${PTHREAD_LIBS}|; s|-ldl|-L${LOCALBASE}/lib|" ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e "s,/usr/bin/ruby,${RUBY}," \
${WRKSRC}/extra/*.rb
@${REINPLACE_CMD} -e "s,/etc/squash.conf,${PREFIX}/etc/squash.conf," \
${WRKSRC}/src/global.c
- @${SED} "s,%%DD%%,${DOCSDIR}," ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
do-install:
${MKDIR} ${PREFIX}/bin
@@ -51,16 +47,13 @@
${INSTALL_SCRIPT} ${WRKSRC}/extra/${FILE}.rb ${PREFIX}/bin
.endfor
${INSTALL_DATA} ${WRKSRC}/extra/musicdb_lib.rb ${RUBY_SITELIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${PREFIX}/etc
+ ${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${PREFIX}/etc/squash.conf.dist
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for i in README doc/FEATURES doc/LOCKS doc/INSTALL doc/USERS_GUIDE
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
-
-post-install:
- @${CAT} ${PKGMESSAGE}
.if ${OSVERSION} < 501100
diff -ruN --exclude=CVS /usr/ports/audio/squash/distinfo /root/squash/distinfo
--- /usr/ports/audio/squash/distinfo Sat Nov 22 23:32:00 2003
+++ /root/squash/distinfo Thu Feb 26 18:00:27 2004
@@ -1,2 +1,2 @@
-$FreeBSD: ports/audio/squash/distinfo,v 1.1 2003/11/22 22:32:00 pav Exp $
-MD5 (squash-1.0pre1.tar.bz2) = 017b935067e6f01058af76ad595ccae1
+MD5 (squash-1.0.tar.bz2) = 8db5cb7686a1b80ffc1b49421fd15b6f
+SIZE (squash-1.0.tar.bz2) = 84366
diff -ruN --exclude=CVS /usr/ports/audio/squash/files/patch-FIXLOCK-src_global_squash.c /root/squash/files/patch-FIXLOCK-src_global_squash.c
--- /usr/ports/audio/squash/files/patch-FIXLOCK-src_global_squash.c Thu Jan 1 01:00:00 1970
+++ /root/squash/files/patch-FIXLOCK-src_global_squash.c Thu Feb 26 18:57:40 2004
@@ -0,0 +1,10 @@
+--- ./src/global_squash.c~ Fri Dec 5 21:23:51 2003
++++ ./src/global_squash.c Thu Feb 26 18:57:02 2004
+@@ -143,7 +143,6 @@
+ playlist_queue_song( song, state_info.raw_songs[state_info.current_song].position );
+ }
+ state_info.current_song++;
+- squash_unlock(state_info.lock);
+ squash_wunlock(database_info.lock);
+ squash_unlock(song_queue.lock);
+ squash_unlock(state_info.lock);
diff -ruN --exclude=CVS /usr/ports/audio/squash/files/pkg-message.in /root/squash/files/pkg-message.in
--- /usr/ports/audio/squash/files/pkg-message.in Sat Nov 22 23:32:00 2003
+++ /root/squash/files/pkg-message.in Thu Jan 1 01:00:00 1970
@@ -1,4 +0,0 @@
----------------------------------------------------------------------------
-NOTE: You MUST configure squash and run a script before you can use squash.
-Please see %%DD%%/INSTALL for details.
----------------------------------------------------------------------------
diff -ruN --exclude=CVS /usr/ports/audio/squash/pkg-plist /root/squash/pkg-plist
--- /usr/ports/audio/squash/pkg-plist Sat Nov 22 23:32:00 2003
+++ /root/squash/pkg-plist Thu Feb 26 18:28:26 2004
@@ -5,11 +5,5 @@
bin/joystick.rb
bin/squash
bin/uncollect_info.rb
-etc/squash.conf
+etc/squash.conf.dist
%%RUBY_SITELIBDIR%%/musicdb_lib.rb
-%%DOCSDIR%%/FEATURES
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/LOCKS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/USERS_GUIDE
-@dirrm %%DOCSDIR%%
--- squash-1.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040226180527.B56AD1B2AB>