svn commit: r330633 - in head/audio/libworkman: . files

[Guido Falsi]

Author: madpilot
Date: Thu Oct 17 12:00:55 2013
New Revision: 330633
URL: http://svnweb.freebsd.org/changeset/ports/330633

Log:
  - Convert to staging
  - Rename patch files according to standard

Added:
     - copied unchanged from r330624, head/audio/libworkman/files/patch-ab
     - copied unchanged from r330461, head/audio/libworkman/files/patch-ad
     - copied unchanged from r330461, head/audio/libworkman/files/patch-ac
Directory Properties:
  head/audio/libworkman/files/patch-Imakefile   (props changed)
  head/audio/libworkman/files/patch-plat_freebsd.c   (props changed)
  head/audio/libworkman/files/patch-wm_helpers.c   (props changed)
Deleted:
  head/audio/libworkman/files/patch-ab
  head/audio/libworkman/files/patch-ac
  head/audio/libworkman/files/patch-ad
Modified:
  head/audio/libworkman/Makefile   (contents, props changed)

Modified: head/audio/libworkman/Makefile
==============================================================================
--- head/audio/libworkman/Makefile	Thu Oct 17 12:00:16 2013	(r330632)
+++ head/audio/libworkman/Makefile	Thu Oct 17 12:00:55 2013	(r330633)
@@ -16,14 +16,13 @@ LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 USES=		imake
-NO_STAGE=	yes
 WRKSRC=		${WRKDIR}/libworkman
 USE_LDCONFIG=	yes
 CFLAGS+=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^DESTDIR|XCOMM DESTDIR| ; \
+		's|^DESTDIR=.*|DESTDIR=${STAGEDIR}| ; \
 		 s|=include/workman|=$$(INCROOT)/workman| ; \
 		 s|^LIBDIR|XCOMM LIBDIR|' ${WRKSRC}/Config
 

Copied: head/audio/libworkman/files/patch-Imakefile (from r330624, head/audio/libworkman/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libworkman/files/patch-Imakefile	Thu Oct 17 12:00:55 2013	(r330633, copy of r330624, head/audio/libworkman/files/patch-ab)
@@ -0,0 +1,28 @@
+--- Imakefile.orig	1999-05-30 00:48:17.000000000 +0900
++++ Imakefile	2011-08-23 13:40:41.000000000 +0900
+@@ -31,7 +31,7 @@
+ 
+ #include "include/wm_version.h"
+ 
+-WM_LIBVER=WM_LIBVER_MAJOR.WM_LIBVER_MINOR.WM_LIBVER_PL
++WM_LIBVER=WM_LIBVER_MAJOR.WM_LIBVER_MINOR
+ 
+ SRCS = cddb.c cdrom.c cdinfo.c plat_freebsd.c plat_sun.c plat_hpux.c \
+        plat_ultrix.c plat_news.c plat_bsd386.c plat_osf1.c plat_linux.c \
+@@ -47,6 +47,7 @@
+ 
+ HEADERS= \
+ 	include/wm_cdda.h \
++	include/wm_cddb.h \
+ 	include/wm_cdinfo.h \
+ 	include/wm_cdrom.h \
+ 	include/wm_config.h \
+@@ -65,7 +66,7 @@
+ 
+ #ifdef SHARED_LIBWORKMAN
+ SharedLibraryTarget(workman,$(WM_LIBVER),$(OBJS),.,.)
+-InstallSharedLibrary(workman,$(WM_LIBVER),$(LIBDIR))
++InstallSharedLibrary(workman,$(WM_LIBVER),$(USRLIBDIR))
+ #else
+ NormalLibraryTarget(workman, $(OBJS))
+ #endif

Copied: head/audio/libworkman/files/patch-plat_freebsd.c (from r330461, head/audio/libworkman/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libworkman/files/patch-plat_freebsd.c	Thu Oct 17 12:00:55 2013	(r330633, copy of r330461, head/audio/libworkman/files/patch-ad)
@@ -0,0 +1,10 @@
+--- plat_freebsd.c.orig	Thu Jan 27 12:17:46 2000
++++ plat_freebsd.c	Thu Jan 27 12:18:15 2000
+@@ -49,7 +49,6 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <sys/cdio.h>
+-#include <sys/scsiio.h>
+ 
+ #if defined(__NetBSD__)
+ # define MSF_MINUTES 1

Copied: head/audio/libworkman/files/patch-wm_helpers.c (from r330461, head/audio/libworkman/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libworkman/files/patch-wm_helpers.c	Thu Oct 17 12:00:55 2013	(r330633, copy of r330461, head/audio/libworkman/files/patch-ac)
@@ -0,0 +1,11 @@
+--- wm_helpers.c.orig	Sun Aug  8 21:05:58 1999
++++ wm_helpers.c	Sun Aug  8 21:06:12 1999
+@@ -30,7 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <stdarg.h>
+ #include <sys/time.h>