Update to 1.7

Joint work with Jasper Lievisse Adriaanse <jasper@nedbsd.nl>
This commit is contained in:
alek 2006-01-08 15:44:50 +00:00
parent be3204766d
commit c8def7a977
6 changed files with 55 additions and 24 deletions

View File

@ -1,33 +1,32 @@
# $OpenBSD: Makefile,v 1.19 2004/11/21 17:51:47 espie Exp $
# $OpenBSD: Makefile,v 1.20 2006/01/08 15:44:50 alek Exp $
COMMENT= "Tcl/Tk CD player"
DISTNAME= xcd-1.6
DISTNAME= xcd-1.7
CATEGORIES= audio
MASTER_SITES= ftp://ftp.obs-besancon.fr/pub/outgoing/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
WANTLIB= c m stdc++
MAKE_FLAGS=BINDIR=${PREFIX}/bin \
CDDIR=${PREFIX}/lib/xcd \
MANDIR=${PREFIX}/man/man1
MASTER_SITES= ${MASTER_SITE_FREEBSD_LOCAL:=jmz/}
FAKE_FLAGS=BINDIR=${WRKINST}${PREFIX}/bin \
CDDIR=${WRKINST}${PREFIX}/lib/xcd \
MANDIR=${WRKINST}${PREFIX}/man/man1
MAKE_FLAGS= BINDIR=${PREFIX}/bin \
CDDIR=${PREFIX}/lib/xcd \
MANDIR=${PREFIX}/man/man1
FAKE_FLAGS= BINDIR=${WRKINST}${PREFIX}/bin \
CDDIR=${WRKINST}${PREFIX}/lib/xcd \
MANDIR=${WRKINST}${PREFIX}/man/man1
WRKDIST= ${WRKDIR}/xcd
MAKE_ENV= CC="${CC}"
RUN_DEPENDS= ::x11/tk/8.4
do-configure:
cd ${WRKDIST} && \
sed -e 's,wish4.1,wish8.4,' <xcd.in >xcd.in.new && \
mv -f xcd.in.new xcd.in
TK_VERSION= 8.4
RUN_DEPENDS= :tk-${TK_VERSION}:x11/tk/${TK_VERSION}
NO_REGRESS= Yes
do-configure:
@perl -pi -e "s,!!WISH!!,${LOCALBASE}/bin/wish${TK_VERSION}," ${WRKDIST}/xcd.in
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (xcd-1.6.tar.gz) = 718427360102e84af3df3e37478623ce
RMD160 (xcd-1.6.tar.gz) = 0d6bfb1eb514e06d2d892f9fd2806706af29daeb
SHA1 (xcd-1.6.tar.gz) = 4788675c455b22e130bd4225cb19062c79da87ad
SIZE (xcd-1.6.tar.gz) = 9402
MD5 (xcd-1.7.tar.gz) = d4196c5e2e6b32c833ad77c744211141
RMD160 (xcd-1.7.tar.gz) = dddbd3bd64f157c2bff344c1fc2381a2fe392356
SHA1 (xcd-1.7.tar.gz) = b6f7b58a404708418fb5b2847653304751d9fd47
SIZE (xcd-1.7.tar.gz) = 7420

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1 2006/01/08 15:44:50 alek Exp $
--- Makefile.orig Sun Jan 8 15:57:05 2006
+++ Makefile Sun Jan 8 15:57:09 2006
@@ -8,7 +8,7 @@ xcd: xcd.in
< xcd.in > $@
chmod ugo+x xcd
cdplayer: cdplayer.cc
- $(CC) $(CFLAGS) -o $@ cdplayer.cc -lm
+ $(CXX) $(CFLAGS) -o $@ cdplayer.cc -lm
install: xcd cdplayer
mkdir -p $(BINDIR)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-cdplayer_cc,v 1.1 2006/01/08 15:44:50 alek Exp $
--- cdplayer.cc.orig Sun Jan 8 15:56:08 2006
+++ cdplayer.cc Sun Jan 8 15:56:14 2006
@@ -29,7 +29,7 @@ private:
public:
button (char *s) {state=0; strcpy (name, s);}
~button () {}
- set (int i) {
+ void set (int i) {
if (state != i) {
state = i;
if (state == 0)

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-xcd_in,v 1.1 2006/01/08 15:44:50 alek Exp $
--- xcd.in.orig Sun Jan 8 16:15:06 2006
+++ xcd.in Sun Jan 8 16:15:18 2006
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wish8.0 -f
+#!!!WISH!! -f
# -*- tcl -*-
# Copyright (C) 1998 by Jean-Marc Zucconi (jmz@FreeBSD.ORG)

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2004/09/14 23:16:56 espie Exp $
bin/cdplayer
@comment $OpenBSD: PLIST,v 1.6 2006/01/08 15:44:50 alek Exp $
bin/xcd
lib/xcd/
lib/xcd/cdplayer
lib/xcd/eject.xbm
lib/xcd/eject_s.xbm
lib/xcd/ff.xbm
@ -18,5 +18,4 @@ lib/xcd/rewind.xbm
lib/xcd/rewind_s.xbm
lib/xcd/stop.xbm
lib/xcd/stop_s.xbm
@man man/man1/cdplayer.1
@man man/man1/xcd.1