From 6d2f1d4a6825607f923787b61564ec1fe33ed3bf Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Thu, 17 Oct 2013 12:00:16 +0000 Subject: [PATCH] - Convert to staging - Fix build with clang - Rename patch files according to standard - Convert to new LIB_DEPENDS format --- audio/workman/Makefile | 10 ++-------- audio/workman/files/patch-cdrom.c | 11 +++++++++++ .../workman/files/{patch-ac => patch-plat_freebsd.c} | 0 audio/workman/files/{patch-aa => patch-workman.man} | 0 .../workman/files/{patch-ab => patch-workman_stubs.c} | 0 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 audio/workman/files/patch-cdrom.c rename audio/workman/files/{patch-ac => patch-plat_freebsd.c} (100%) rename audio/workman/files/{patch-aa => patch-workman.man} (100%) rename audio/workman/files/{patch-ab => patch-workman_stubs.c} (100%) diff --git a/audio/workman/Makefile b/audio/workman/Makefile index c37a5b8a178c..ae9733d1ce3a 100644 --- a/audio/workman/Makefile +++ b/audio/workman/Makefile @@ -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 diff --git a/audio/workman/files/patch-cdrom.c b/audio/workman/files/patch-cdrom.c new file mode 100644 index 000000000000..2b6e63f2cddf --- /dev/null +++ b/audio/workman/files/patch-cdrom.c @@ -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) diff --git a/audio/workman/files/patch-ac b/audio/workman/files/patch-plat_freebsd.c similarity index 100% rename from audio/workman/files/patch-ac rename to audio/workman/files/patch-plat_freebsd.c diff --git a/audio/workman/files/patch-aa b/audio/workman/files/patch-workman.man similarity index 100% rename from audio/workman/files/patch-aa rename to audio/workman/files/patch-workman.man diff --git a/audio/workman/files/patch-ab b/audio/workman/files/patch-workman_stubs.c similarity index 100% rename from audio/workman/files/patch-ab rename to audio/workman/files/patch-workman_stubs.c