From owner-svn-ports-head@FreeBSD.ORG Sat Sep 28 15:35:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 60E88436; Sat, 28 Sep 2013 15:35:06 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CA01220C; Sat, 28 Sep 2013 15:35:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8SFZ6LZ054561; Sat, 28 Sep 2013 15:35:06 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8SFZ4T8054546; Sat, 28 Sep 2013 15:35:04 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201309281535.r8SFZ4T8054546@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 28 Sep 2013 15:35:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328584 - in head/audio/wavplay: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Sep 2013 15:35:06 -0000 Author: amdmi3 Date: Sat Sep 28 15:35:04 2013 New Revision: 328584 URL: http://svnweb.freebsd.org/changeset/ports/328584 Log: - Support staging - Rename patches according to porter's handbook Added: head/audio/wavplay/files/patch-Makefile - copied unchanged from r328540, head/audio/wavplay/files/patch-aa head/audio/wavplay/files/patch-client.c - copied unchanged from r328540, head/audio/wavplay/files/patch-ab head/audio/wavplay/files/patch-file.c - copied unchanged from r328540, head/audio/wavplay/files/patch-ac head/audio/wavplay/files/patch-main.c - copied unchanged from r328540, head/audio/wavplay/files/patch-ad head/audio/wavplay/files/patch-msg.c - copied unchanged from r328540, head/audio/wavplay/files/patch-ae head/audio/wavplay/files/patch-recplay.c - copied unchanged from r328540, head/audio/wavplay/files/patch-af head/audio/wavplay/files/patch-server.c - copied unchanged from r328540, head/audio/wavplay/files/patch-ag head/audio/wavplay/files/patch-xltwavplay.c - copied unchanged from r328540, head/audio/wavplay/files/patch-ah Deleted: head/audio/wavplay/files/patch-aa head/audio/wavplay/files/patch-ab head/audio/wavplay/files/patch-ac head/audio/wavplay/files/patch-ad head/audio/wavplay/files/patch-ae head/audio/wavplay/files/patch-af head/audio/wavplay/files/patch-ag head/audio/wavplay/files/patch-ah Modified: head/audio/wavplay/Makefile Modified: head/audio/wavplay/Makefile ============================================================================== --- head/audio/wavplay/Makefile Sat Sep 28 15:33:59 2013 (r328583) +++ head/audio/wavplay/Makefile Sat Sep 28 15:35:04 2013 (r328584) @@ -12,11 +12,10 @@ COMMENT= A wav player and recorder ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON=Doesn't work on !i386 and amd64 -NO_STAGE= yes -MAN1= wavplay.1 +MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}" -PLIST_FILES= bin/wavplay bin/wavrec +PLIST_FILES= bin/wavplay bin/wavrec man/man1/${PORTNAME}.1.gz post-patch: @${REINPLACE_CMD} -e 's|u_long|u_int|g' ${WRKSRC}/*.c ${WRKSRC}/*.h Copied: head/audio/wavplay/files/patch-Makefile (from r328540, head/audio/wavplay/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-Makefile Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-aa) @@ -0,0 +1,148 @@ +--- Makefile.orig Sat Dec 4 09:06:42 1999 ++++ Makefile Thu Jun 22 01:50:48 2000 +@@ -38,7 +38,7 @@ + #---------------------------------------------------------------------- + # If you are running a 386 you should comment this line out. + # +-CPU=-m486 ++#CPU=-m486 + + #---------------------------------------------------------------------- + # If you are experiencing troubles (like core dumps!), then uncomment +@@ -47,7 +47,7 @@ + # adjust the STRIP option to suit compile mode: + # + #DEBUG=-g +-OPT=-O2 ++#OPT=-O2 + + #---------------------------------------------------------------------- + # When using 'DEBUG=-g' above, then comment out the 'strip' line: +@@ -59,7 +59,9 @@ + # This parameter indicates where the program binaries should be + # placed (wavplay, wavrec, and xltwavplay) + # +-INSTDIR=/usr/local/bin ++PREFIX?=/usr/local ++INSTDIR=$(PREFIX)/bin ++MANDIR=$(PREFIX)/man/man1 + + #---------------------------------------------------------------------- + # Uncomment this line if you want to install the xltwavplay.res resource +@@ -81,14 +83,14 @@ + # to disable the EDITRES facility. If you're not compiling xltwavplay + # then this setting can be left asis. + # +-#NOEDITRES=-DNO_EDITRES ++NOEDITRES=-DNO_EDITRES + + #---------------------------------------------------------------------- + # If you COMMENTED OUT the NOEDITRES line, then UNCOMMENT this line. + # If you UNCOMMENTED the NOEDITRES line, then COMMENT out this line. + # (ie. do the opposite of NOEDITRES) + # +-LIBXMU=-lXmu ++#LIBXMU=-lXmu + + #---------------------------------------------------------------------- + # These are the non X load options (for wavplay/wavrec) +@@ -106,7 +108,13 @@ + # only the standard getopt() routine. When commented out, the long options like --help + # are recognized, with the help of the getopt_long() routine. + # +-#STDGETOPTS= -DUSE_GETOPT_STD ++STDGETOPTS= -DUSE_GETOPT_STD ++ ++#---------------------------------------------------------------------- ++# ++# Uncomment this when compiling on FreeBSD. ++ ++EXTRAOPTS=-DFREEBSD -D__GNU_LIBRARY__ + + #---------------------------------------------------------------------- + # The next option specifies the pathname that the xltwavplay X client should exec +@@ -133,7 +141,7 @@ + # Environment variable DSPPATH will override this value at runtime, if + # present. + # +-#DSPPATH= -DAUDIODEV=\"/dev/dsp\" ++DSPPATH= -DAUDIODEV=\"/dev/audio\" + + #---------------------------------------------------------------------- + # Semaphore IPC Key for the Play & Record locks (Default is 0x33333333) +@@ -163,19 +171,19 @@ + # this should be unecessary if the appropriate symlinks are + # installed). + # +-#CUSTINCL= -I/usr/X11R6/include/X11 -I/usr/local/lesstif/include/Xm ++#CUSTINCL= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include/Xm -I/${LOCALBASE}/include + + #---------------------------------------------------------------------- + # Normally, you shouldn't need to change anything beyond this point: + #---------------------------------------------------------------------- + .SUFFIXES: .c .cc .h .o + +-CUSTMOPTS=$(STDGETOPTS) $(PLAYPATH) $(DSPMIN) $(DSPMAX) $(DSPPATH) $(DSPLOCKS) $(USERES) $(NOEDITRES) $(SCHED_PRIORITY) ++CUSTMOPTS=$(STDGETOPTS) $(EXTRAOPTS) $(PLAYPATH) $(DSPMIN) $(DSPMAX) $(DSPPATH) $(DSPLOCKS) $(USERES) $(NOEDITRES) $(SCHED_PRIORITY) + ELF= # -fPIC + INCL= -I. $(CUSTINCL) +-CCFLAGS= -c $(DEBUG)$(OPT) $(CPU) $(ELF) -fhandle-exceptions $(CUSTMOPTS) -Wall -Wstrict-prototypes +-CFLAGS= -c $(DEBUG)$(OPT) $(CPU) $(ELF) -Wall -Wstrict-prototypes $(CUSTMOPTS) +-CC= gcc ++CCFLAGS+= -c $(DEBUG)$(OPT) $(CPU) $(ELF) -fhandle-exceptions $(CUSTMOPTS) -Wall -Wstrict-prototypes ++CFLAGS+= -c $(DEBUG)$(OPT) $(CPU) $(ELF) -Wall -Wstrict-prototypes $(CUSTMOPTS) ++CC?= gcc + CP= g++ + + HDRFIL= client.h server.h wavfile.h wavplay.h xltwavplay.h xmsprint.h +@@ -189,9 +197,9 @@ + .c.o: + $(CC) $(CFLAGS) $(INCL) $< + +-all: wavplay wavrec xltwavplay ++all: wavplay wavrec + +-no_x: wavplay wavrec ++with_x: wavplay wavrec xltwavplay + + # wavdump: $(WVDMPO) + # $(CP) $(WVDMPO) $(LDOPTS) $(DEBUG) -o wavdump -lRIFF +@@ -209,18 +217,21 @@ + $(STRIP) xltwavplay + ls -l xltwavplay + +-install: install_wavplay install_xltwavplay ++install: install_wavplay install_man + +-install_no_x: install_wavplay ++install_with_x: install_wavplay install_xltwavplay install_man + + install_wavplay: wavplay wavrec +- @[ ! -d "$(INSTDIR)" ] && echo "You do not have a directory $(INSTDIR); Check INSTDIR in make file." && exit 13 || : +- $(INSTALL) -o root -g root -m 555 wavplay $(INSTDIR) ++ mkdir -p $(INSTDIR) ++ ${BSD_INSTALL_PROGRAM} wavplay $(INSTDIR) + rm -f $(INSTDIR)/wavrec + ln $(INSTDIR)/wavplay $(INSTDIR)/wavrec +- @[ ! -z "$(SCHED_PRIORITY)" ] && echo "*** DO 'make setuid_root' IF YOU WANT REAL TIME SCHEDULING ***" || : + @echo + ++install_man: wavplay.1 ++ mkdir -p $(MANDIR) ++ ${BSD_INSTALL_MAN} wavplay.1 $(MANDIR) ++ + xltwavplay_test: wavplay xltwavplay + WAVPLAYPATH=./wavplay ./xltwavplay + +@@ -234,9 +245,9 @@ + @echo + + install_xltwavplay: xltwavplay +- $(INSTALL) -o root -g root -m 555 xltwavplay $(INSTDIR) ++ ${BSD_INSTALL_PROGRAM} xltwavplay $(INSTDIR) + @[ ! -z "$(USERES)" ] \ +- && $(INSTALL) -o root -g root -m 555 xltwavplay.res $(RESDIR)/xltwavplay \ ++ && ${BSD_INSTALL_DATA} xltwavplay.res $(RESDIR)/xltwavplay \ + && ls -dlL $(RESDIR)/xltwavplay/xltwavplay.res \ + || rm -f $(RESDIR)/xltwavplay + Copied: head/audio/wavplay/files/patch-client.c (from r328540, head/audio/wavplay/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-client.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-ab) @@ -0,0 +1,28 @@ +*** client.c.orig Sat Jan 15 13:05:07 2000 +--- client.c Sat Jan 15 13:08:42 2000 +*************** +*** 47,53 **** +--- 47,55 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #endif + #include + #include + #include +*************** +*** 57,63 **** +--- 59,69 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #else ++ #include ++ #endif + #include "wavplay.h" + #include "client.h" + Copied: head/audio/wavplay/files/patch-file.c (from r328540, head/audio/wavplay/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-file.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-ac) @@ -0,0 +1,28 @@ +*** file.c.orig Sat Jan 15 12:55:46 2000 +--- file.c Sat Jan 15 13:15:38 2000 +*************** +*** 56,62 **** +--- 56,64 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #endif + #include + #include + #include +*************** +*** 64,70 **** +--- 66,76 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #else ++ #include ++ #endif + #include "wavplay.h" + + extern int clntIPC; /* Needed for message passing in PlayDSP */ Copied: head/audio/wavplay/files/patch-main.c (from r328540, head/audio/wavplay/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-main.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-ad) @@ -0,0 +1,53 @@ +*** main.c.orig Sat Jan 15 12:51:14 2000 +--- main.c Sat Jan 15 14:14:54 2000 +*************** +*** 56,62 **** +--- 56,64 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #endif + #include + #include + #include +*************** +*** 82,88 **** +--- 84,94 ---- + else printf("Usage:\t%s [options] [files...]\n\n",cmd); + + puts("Options:"); ++ #ifndef FREEBSD + printf("\t-%c\tThis info (or use --help)\n",OPF_HELP); ++ #else ++ printf("\t-%c\tThis info\n",OPF_HELP); ++ #endif + printf("\t-%c\tQuiet mode (no messages)\n",OPF_QUIET); + printf("\t-%c rate\tSampling rate\n",OPF_SAMPRATE); + printf("\t-%c\tDebug mode\n",OPF_DEBUG); +*************** +*** 105,111 **** +--- 111,121 ---- + if ( opr_mode != OprRecord ) + printf("\t-%c\tDisplay info about wav file(s) only\n",OPF_INFO); + ++ #ifndef FREEBSD + printf("\n\t-%c\tDisplay version and Copyright info (or use --version)\n\n",OPF_VERSION); ++ #else ++ printf("\n\t-%c\tDisplay version and Copyright info\n\n",OPF_VERSION); ++ #endif + + puts("\nWAV parameters are normally taken from the input file(s),\n" + "but command line options can override them if required."); +*************** +*** 208,213 **** +--- 218,225 ---- + int rc; /* Return code */ + int fd; /* Temporary file descriptor */ + double d; /* Temporary double value */ ++ char *cp; /* Used for env var */ ++ uid_t uid; + static char cmdopts[] = { + OPF_INFO, OPF_HELP, OPF_QUIET, OPF_SAMPRATE,':', OPF_STEREO, OPF_MONO, + OPF_TIME,':', OPF_DATABITS,':', OPF_IPCKEY,':', OPF_RESET, Copied: head/audio/wavplay/files/patch-msg.c (from r328540, head/audio/wavplay/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-msg.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-ae) @@ -0,0 +1,28 @@ +*** msg.c.orig Sat Jan 15 12:58:40 2000 +--- msg.c Sat Jan 15 13:16:12 2000 +*************** +*** 47,53 **** +--- 47,55 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #endif + #include + #include + #include +*************** +*** 56,62 **** +--- 58,68 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #else ++ #include ++ #endif + #include "wavplay.h" + + /* Copied: head/audio/wavplay/files/patch-recplay.c (from r328540, head/audio/wavplay/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-recplay.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-af) @@ -0,0 +1,30 @@ +--- recplay.c.orig Sat Dec 4 09:06:42 1999 ++++ recplay.c Sun Dec 11 12:56:34 2005 +@@ -52,12 +52,18 @@ + #include + #include + #include ++#ifndef FREEBSD + #include ++#endif + #include + #include + #include + #include ++#ifndef FREEBSD + #include ++#else ++#include ++#endif + #include "wavplay.h" + #include "server.h" + +@@ -184,7 +190,7 @@ + wfile = svr.wfile; /* And the file is already opened */ + } + +- if ( (dfile = OpenDSP(wfile,O_RDWR,v_erf)) == NULL ) ++ if ( (dfile = OpenDSP(wfile,O_RDONLY,v_erf)) == NULL ) + goto errxit; + + if ( RecordDSP(dfile,wfile,samples,svr_work_proc,v_erf) ) Copied: head/audio/wavplay/files/patch-server.c (from r328540, head/audio/wavplay/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-server.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-ag) @@ -0,0 +1,28 @@ +*** server.c.orig Sat Jan 15 12:59:19 2000 +--- server.c Sat Jan 15 13:17:07 2000 +*************** +*** 65,71 **** +--- 65,73 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #endif + #include + #include + #include +*************** +*** 79,85 **** +--- 81,91 ---- + #ifdef SCHED_PRIORITY + #include + #endif ++ #ifndef FREEBSD + #include ++ #else ++ #include ++ #endif + #include "wavplay.h" + #include "server.h" + Copied: head/audio/wavplay/files/patch-xltwavplay.c (from r328540, head/audio/wavplay/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/wavplay/files/patch-xltwavplay.c Sat Sep 28 15:35:04 2013 (r328584, copy of r328540, head/audio/wavplay/files/patch-ah) @@ -0,0 +1,14 @@ +*** xltwavplay.c.orig Sat Jan 15 13:12:38 2000 +--- xltwavplay.c Sat Jan 15 13:13:02 2000 +*************** +*** 59,65 **** +--- 59,67 ---- + #include + #include + #include ++ #ifndef FREEBSD + #include ++ #endif + #include + #include + #include