Date: Thu, 17 Oct 2013 12:00:16 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330632 - in head/audio/workman: . files Message-ID: <201310171200.r9HC0GmB051170@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Oct 17 12:00:16 2013 New Revision: 330632 URL: http://svnweb.freebsd.org/changeset/ports/330632 Log: - Convert to staging - Fix build with clang - Rename patch files according to standard - Convert to new LIB_DEPENDS format Added: head/audio/workman/files/patch-cdrom.c (contents, props changed) - copied unchanged from r330460, head/audio/workman/files/patch-ac - copied unchanged from r330460, head/audio/workman/files/patch-aa - copied unchanged from r330460, head/audio/workman/files/patch-ab Directory Properties: head/audio/workman/files/patch-plat_freebsd.c (props changed) head/audio/workman/files/patch-workman.man (props changed) head/audio/workman/files/patch-workman_stubs.c (props changed) Deleted: head/audio/workman/files/patch-aa head/audio/workman/files/patch-ab head/audio/workman/files/patch-ac Modified: head/audio/workman/Makefile (contents, props changed) Modified: head/audio/workman/Makefile ============================================================================== --- head/audio/workman/Makefile Thu Oct 17 11:51:37 2013 (r330631) +++ head/audio/workman/Makefile Thu Oct 17 12:00:16 2013 (r330632) @@ -12,17 +12,11 @@ DISTNAME= WorkMan-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Open Look-based CD player tool -LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview +LIB_DEPENDS= libxview.so:${PORTSDIR}/x11-toolkits/xview WRKSRC= ${WRKDIR}/workman USES= imake -NO_STAGE= yes USE_XORG= x11 xext -MAN1= workman.1 -MAN5= workmandb.5 -PLIST_FILES= bin/workman lib/help/workman.info - -post-install: - ${GZIP_CMD} ${PREFIX}/man/man5/workmandb.5 +PLIST_FILES= bin/workman lib/help/workman.info man/man1/workman.1.gz man/man5/workmandb.5.gz .include <bsd.port.mk> Added: head/audio/workman/files/patch-cdrom.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/workman/files/patch-cdrom.c Thu Oct 17 12:00:16 2013 (r330632) @@ -0,0 +1,11 @@ +--- cdrom.c.orig 1997-06-15 10:05:03.000000000 +0200 ++++ cdrom.c 2013-10-16 13:14:49.440566031 +0200 +@@ -531,7 +531,7 @@ + int top = 0, bottom, current, interval, ret = 0, i; + + if (cur_cdmode == EJECTED || cd == NULL) +- return; ++ return (0); + + for (i = 0; i < cur_ntracks; i++) + if (cd->trk[i].track == track) Copied: head/audio/workman/files/patch-plat_freebsd.c (from r330460, head/audio/workman/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/workman/files/patch-plat_freebsd.c Thu Oct 17 12:00:16 2013 (r330632, copy of r330460, head/audio/workman/files/patch-ac) @@ -0,0 +1,69 @@ +--- plat_freebsd.c.orig Mon Feb 20 17:29:55 1995 ++++ plat_freebsd.c Tue Oct 13 03:24:22 1998 +@@ -5,6 +5,9 @@ + * + * Todd Pfaff, 3/20/94 + * ++ * 11/26/95: Modified to work under FreeBSD 2.x ++ * by Donald Burr <d_burr@ix.netcom.com> ++ * + */ + static char *ident = "@(#)plat_freebsd.c 1.2 2/20/95"; + +@@ -22,21 +25,17 @@ + #include <string.h> + #include <sys/ioctl.h> + #include <sys/cdio.h> +-#include <sys/scsiio.h> + #ifdef __NetBSD__ + #define MSF_MINUTES 1 + #define MSF_SECONDS 2 + #define MSF_FRAMES 3 + #include "/sys/scsi/scsi_all.h" + #include "/sys/scsi/scsi_cd.h" +-#else +-#include <scsi/scsi_all.h> +-#include <scsi/scsi_cd.h> + #endif + + #include "struct.h" + +-#define DEFAULT_CD_DEVICE "/dev/rcd0d" ++#define DEFAULT_CD_DEVICE "/dev/rcd0c" + + void *malloc(); + +@@ -163,7 +162,7 @@ + } + + if (ioctl(d->fd, CDIOCREADSUBCHANNEL, &sc)) { +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + /* we need to release the device so the kernel will notice + reloaded media */ + (void) close(d->fd); +@@ -261,6 +260,9 @@ + + bzero((char *)&vol, sizeof(vol)); + ++#define LEFT_PORT 0 ++#define RIGHT_PORT 1 ++ + vol.vol[LEFT_PORT] = left; + vol.vol[RIGHT_PORT] = right; + +@@ -345,12 +347,12 @@ + if (fstatfs(stbuf.st_rdev, &buf) == 0) + return (-3); + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + rval = ioctl(d->fd, CDIOCALLOW); + if (rval == 0) + #endif + rval = ioctl(d->fd, CDIOCEJECT); +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + if (rval == 0) + rval = ioctl(d->fd, CDIOCPREVENT); + #endif Copied: head/audio/workman/files/patch-workman.man (from r330460, head/audio/workman/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/workman/files/patch-workman.man Thu Oct 17 12:00:16 2013 (r330632, copy of r330460, head/audio/workman/files/patch-aa) @@ -0,0 +1,48 @@ +diff -c --recursive ./workman.man ../workman.new/./workman.man +*** ./workman.man Thu Jun 15 23:52:13 1995 +--- ../workman.new/./workman.man Sun Nov 26 03:28:54 1995 +*************** +*** 151,157 **** + .TP + .I \-p file + Write the program's process ID to a different \fIfile\fP. By default, the +! PID is written to "/tmp/.wm_pid" to allow signals to be sent more easily + (see the SIGNALS section below.) + .TP + .I \-n +--- 151,157 ---- + .TP + .I \-p file + Write the program's process ID to a different \fIfile\fP. By default, the +! PID is written to "/var/run/workman.pid" to allow signals to be sent more easily + (see the SIGNALS section below.) + .TP + .I \-n +*************** +*** 510,515 **** +--- 510,516 ---- + SVR4 port by Baruch Cochavy <bcochavy@iil.intel.com>. + .LP + FreeBSD port by Todd Pfaff <todd@flex.eng.mcmaster.ca>. ++ Modified to work under FreeBSD 2.x by Donald Burr <d_burr@ix.netcom.com>. + .LP + OSF/1 port by R.J. Edwards <rje@escact.ksc.nasa.gov>. + .LP +diff -c --recursive ./workman_stubs.c ../workman.new/./workman_stubs.c +*** ./workman_stubs.c Fri Jun 16 10:44:40 1995 +--- ../workman.new/./workman_stubs.c Sun Nov 26 03:26:57 1995 +*************** +*** 56,62 **** +--- 56,67 ---- + Panel_item quitbutton; + char *getenv(), *WMstrdup(); + ++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ /* FreeBSD has a special directory for pidfiles, I guess. */ ++ char *pidfile = "/var/run/workman.pid"; ++ #else + char *pidfile = "/tmp/.wm_pid"; ++ #endif + char * empty = ""; + extern char *cd_device; + Copied: head/audio/workman/files/patch-workman_stubs.c (from r330460, head/audio/workman/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/workman/files/patch-workman_stubs.c Thu Oct 17 12:00:16 2013 (r330632, copy of r330460, head/audio/workman/files/patch-ab) @@ -0,0 +1,12 @@ +--- workman_stubs.c.orig Sat Feb 14 08:47:37 1998 ++++ workman_stubs.c Sat Feb 14 08:50:16 1998 +@@ -163,6 +163,9 @@ + "Workman.Db.Shared", dbfiles); + if (dbfiles) + dbfiles = WMstrdup(dbfiles); ++ name = getenv("MUSIC_CD"); ++ if (name) ++ cd_device = name; + + reverse_threshold = defaults_get_integer("workman.reverseThreshold", + "Workman.ReverseThreshold", reverse_threshold);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310171200.r9HC0GmB051170>