kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Drop dependency on ncurses as system curses works fine.

Browse source 
Regenrate patchset.
This commit is contained in:
roy 2013-10-14 13:33:31 +00:00
parent 9109fa6d98
commit 6a925ea4ba
9 changed files with 70 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
audio/emixer/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.31 2013/04/06 03:45:06 rodent Exp $
# $NetBSD: Makefile,v 1.32 2013/10/14 13:33:31 roy Exp $
#
DISTNAME= emixer-0.05.5
PKGNAME= emixer-0.5.5
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= # http://emixer.linuxbox.com/
@ -20,6 +20,6 @@ INSTALLATION_DIRS= bin share/doc
post-extract:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

12
audio/emixer/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.5 2005/02/23 20:39:44 agc Exp $
$NetBSD: distinfo,v 1.6 2013/10/14 13:33:31 roy Exp $
SHA1 (emixer-0.05.5.tar.gz) = acae7acf3cd11633d1f800047287d9f52e8e7d02
RMD160 (emixer-0.05.5.tar.gz) = f937ae68e32917e58983d9ccfec7039a8e8f1be3
Size (emixer-0.05.5.tar.gz) = 19609 bytes
SHA1 (patch-aa) = f6039822d61548ba93ec9db9b31380f14c36cdd8
SHA1 (patch-ab) = a782737118c0ba6ae704a1839d93047a6f7e568e
SHA1 (patch-ac) = 453d5510e1a0c342b7a69fe3033c4677f9f77db5
SHA1 (patch-ad) = 031e3f007b6c820c09f0673f592008a9c137bec7
SHA1 (patch-ae) = 237b10820c528aa4fbcdef31331cd1b4d1098968
SHA1 (patch-main.c) = c9afac560ffe1c91d558fcdf4e198dc1d260dc58
SHA1 (patch-mixer.c) = 188b13e5b7210d875f3faa230ff1e1731146c8d9
SHA1 (patch-mixer.h) = 765a989d6c036f68496e49345e258657caef48af
SHA1 (patch-nctgui.c) = 60d82c1b8a84e930068c8486a09edd36fbde2394
SHA1 (patch-nctgui.h) = 4a87c54612a7c718617ceb85a31b4f61aee67338

4
audio/emixer/files/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.7 2009/07/08 15:52:33 joerg Exp $
# $NetBSD: Makefile,v 1.8 2013/10/14 13:33:31 roy Exp $
all: emixer
emixer: main.o
${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lncurses ${LIBOSSAUDIO}
${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lcurses ${LIBOSSAUDIO}
install:
${BSD_INSTALL_PROGRAM} emixer ${DESTDIR}${PREFIX}/bin/emixer

12
audio/emixer/patches/patch-ab
View file

@ -1,12 +0,0 @@
$NetBSD: patch-ab,v 1.3 2001/06/19 15:57:39 jlam Exp $
--- nctgui.h.orig Mon Dec 27 19:47:02 1999
+++ nctgui.h
@@ -9,7 +9,6 @@
/* include files used by gui.c and main.c */
#include <ncurses.h>
-#include <slang/slang.h>
#include <string.h>
/* defines used by gui.c and main.c */

50
audio/emixer/patches/patch-ad → audio/emixer/patches/patch-main.c
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
$NetBSD: patch-main.c,v 1.1 2013/10/14 13:33:31 roy Exp $
--- main.c.orig 2000-01-26 00:11:56.000000000 +0000
+++ main.c 2004-01-28 10:53:42.000000000 +0000
@@ -115,8 +115,6 @@
+++ main.c
@@ -115,8 +115,6 @@ void make_menus(int num_menus, char **me
menus_active = FALSE;
/*initialize screen routines*/
@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
ncurses_init();
set_ncurses_color_schemes();
create_windows();
@@ -125,19 +123,9 @@
@@ -125,19 +123,9 @@ void make_menus(int num_menus, char **me
change_channel(&ch1,mp3Path1);
change_channel(&ch2,mp3Path2);
@ -33,7 +33,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
while(TRUE)
{
@@ -149,9 +137,9 @@
@@ -149,9 +137,9 @@ void make_menus(int num_menus, char **me
if((ch1.end==1)||(ch2.end==1)) display_track_status();
if(rcount==5)
{
@ -46,7 +46,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
}
if(playmode==1) /*loop play*/
@@ -173,7 +161,7 @@
@@ -173,7 +161,7 @@ void make_menus(int num_menus, char **me
}
}
@ -55,7 +55,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
{
if((ch1.on==0)&&(ch1.end==1))
{
@@ -215,7 +203,7 @@
@@ -215,7 +203,7 @@ void make_menus(int num_menus, char **me
}
}
@ -64,7 +64,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
{
if((ch1.on==0)&&(ch1.end==1))
{
@@ -259,9 +247,9 @@
@@ -259,9 +247,9 @@ void make_menus(int num_menus, char **me
{
{
display_info(inactive_info);
@ -76,7 +76,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
vpos=0;
hpos=(hpos>0) ? --hpos: num_menus-1;
display_bar(num_menus, menu_name);
@@ -270,7 +258,7 @@
@@ -270,7 +258,7 @@ void make_menus(int num_menus, char **me
display_menu(menu_item,num_items);
break;
@ -85,7 +85,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
vpos=0;
hpos=(hpos<num_menus-1) ? ++hpos: 0;
display_bar(num_menus, menu_name);
@@ -279,28 +267,27 @@
@@ -279,28 +267,27 @@ void make_menus(int num_menus, char **me
display_menu(menu_item,num_items);
break;
@ -120,7 +120,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
vpos=0;
menus_active=FALSE;
display_ch_window(active_channel);
@@ -318,42 +305,41 @@
@@ -318,42 +305,41 @@ void make_menus(int num_menus, char **me
else
{
display_info(inactive_info);
@ -171,7 +171,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
}
display_listdata();
display_track_path(active_channel,sim_play,ch1_last,ch2_last);
@@ -472,7 +458,7 @@
@@ -472,7 +458,7 @@ void make_menus(int num_menus, char **me
//printf("------- %i ----------\n",playmode);
break;
@ -180,7 +180,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
if (active_bar==VOLBAR)
{
ch1_volume_pos--;
@@ -507,7 +493,7 @@
@@ -507,7 +493,7 @@ void make_menus(int num_menus, char **me
break;
@ -189,7 +189,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
if (active_bar==VOLBAR)
{
@@ -542,7 +528,7 @@
@@ -542,7 +528,7 @@ void make_menus(int num_menus, char **me
}
break;
@ -198,7 +198,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
if (active_bar==VOLBAR)
{
ch2_volume_pos--;
@@ -574,7 +560,7 @@
@@ -574,7 +560,7 @@ void make_menus(int num_menus, char **me
}
break;
@ -207,7 +207,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
if (active_bar==VOLBAR)
{
ch2_volume_pos++;
@@ -605,7 +591,7 @@
@@ -605,7 +591,7 @@ void make_menus(int num_menus, char **me
}
break;
@ -216,7 +216,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
fader_pos-- ;
if(fader_pos<=-(fader_bars/2))fader_pos=-(fader_bars/2);
if(fader_pos == 0)
@@ -620,7 +606,7 @@
@@ -620,7 +606,7 @@ void make_menus(int num_menus, char **me
display_fader(fader_pos);
break;
@ -225,7 +225,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
fader_pos++;
if(fader_pos>=(fader_bars/2))fader_pos=(fader_bars/2) ;
if(fader_pos == 0)
@@ -660,10 +646,10 @@
@@ -660,10 +646,10 @@ void make_menus(int num_menus, char **me
display_fader(fader_pos);
break;
@ -240,7 +240,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
adjust_display(extcode);
display_ch_window(active_channel);
display_listdata();
@@ -671,9 +657,10 @@
@@ -671,9 +657,10 @@ void make_menus(int num_menus, char **me
case'r': /*redraws screen*/
case'R':
@ -253,7 +253,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
default:
for(j=0; j<num_menus; j++)
@@ -792,7 +779,7 @@
@@ -792,7 +779,7 @@ void adjust_display(int key)
a circular linked list*/
switch(key)
{
@ -262,7 +262,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
if((counter >= height-1)&&(current->fLink!=NULL))
{
top=top->fLink; current=current->fLink;
@@ -800,7 +787,7 @@
@@ -800,7 +787,7 @@ void adjust_display(int key)
else if(current->fLink!=NULL) current=current->fLink;
break;
@ -271,7 +271,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
if((top->bLink!=NULL)&&(top==current))
{
top=top->bLink; current=current->bLink;
@@ -809,14 +796,14 @@
@@ -809,14 +796,14 @@ void adjust_display(int key)
if(current->bLink!=NULL) current=current->bLink ;
break;
@ -288,7 +288,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
while((index < height-1)&(top->bLink!=NULL))
{
top=top->bLink; current=current->bLink; index++;
@@ -884,11 +871,9 @@
@@ -884,11 +871,9 @@ void display_listdata(void)
height1,width1;
node *top, *current, *temp;
@ -300,7 +300,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
}
else if(active_channel==CHANNEL_2)
{
@@ -904,46 +889,53 @@
@@ -904,46 +889,53 @@ void display_listdata(void)
while(temp!=bHead){tracktotal++;temp=temp->fLink;}
/* display current track number and total tracks */
@ -365,7 +365,7 @@ $NetBSD: patch-ad,v 1.4 2004/01/28 10:56:21 agc Exp $
} /*display_listdata */
void menu_action(char *item_name)
@@ -967,21 +959,10 @@
@@ -967,21 +959,10 @@ void enter_action(void)
void exit_prog(void)
{
reset_audio();

8
audio/emixer/patches/patch-ae → audio/emixer/patches/patch-mixer.c
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ae,v 1.1 2000/04/16 03:59:54 mycroft Exp $
$NetBSD: patch-mixer.c,v 1.1 2013/10/14 13:33:31 roy Exp $
--- mixer.c.bak Fri Jan 28 11:29:40 2000
+++ mixer.c Sat Apr 15 23:32:21 2000
@@ -57,9 +57,9 @@
--- mixer.c.orig 2000-01-28 16:29:40.000000000 +0000
+++ mixer.c
@@ -57,9 +57,9 @@ void open_sound_device(void)
int format;
int stereo = 1;
int rate = 44100;

6
audio/emixer/patches/patch-aa → audio/emixer/patches/patch-mixer.h
View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.1.1.1 1999/12/13 02:48:41 hubertf Exp $
$NetBSD: patch-mixer.h,v 1.1 2013/10/14 13:33:31 roy Exp $
--- mixer.h.orig Mon Dec 13 02:18:43 1999
+++ mixer.h Mon Dec 13 02:19:01 1999
--- mixer.h.orig 1999-12-28 00:45:52.000000000 +0000
+++ mixer.h
@@ -17,7 +17,11 @@
#include <sys/stat.h>
#include <unistd.h>

26
audio/emixer/patches/patch-ac → audio/emixer/patches/patch-nctgui.c
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
$NetBSD: patch-nctgui.c,v 1.1 2013/10/14 13:33:31 roy Exp $
--- nctgui.c.orig Fri Jan 28 17:30:52 2000
--- nctgui.c.orig 2000-01-28 16:30:52.000000000 +0000
+++ nctgui.c
@@ -31,6 +31,10 @@
@@ -31,6 +31,10 @@ void ncurses_init(void)
{
(void) initscr();
curs_set(0);
@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
}/* ncurses_init */
void ncurses_exit(void)
@@ -66,24 +70,23 @@
@@ -66,24 +70,23 @@ void display_bar(int num_menus,char **me
int j;
int maxY,maxX;
@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
} /* display_bar */
/*Display additional info at bottom of screen*/
@@ -106,14 +109,14 @@
@@ -106,14 +109,14 @@ void display_menu(char *menu_item[][MAX_
for(j=0;j<num_items[hpos];j++)
{
@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
box(subWn,0,0);
wrefresh(subWn);
} /* display_menu */
@@ -127,7 +130,8 @@
@@ -127,7 +130,8 @@ void display_ch_window(int active_channe
switch(active_channel)
{
case CHANNEL_1:
@ -73,7 +73,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
box(chWin,0,0);
wmove(chWin,0,2);
wattrset(chWin,COLOR_PAIR(5)|A_BOLD|A_BLINK);
@@ -137,7 +141,8 @@
@@ -137,7 +141,8 @@ void display_ch_window(int active_channe
break;
case CHANNEL_2:
@ -83,7 +83,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
box(chWin,0,0);
wmove(chWin,0,width-13);
wattrset(chWin,COLOR_PAIR(6)|A_BOLD|A_BLINK);
@@ -155,6 +160,7 @@
@@ -155,6 +160,7 @@ void display_fader(int fader_pos)
int centre, j;
centre=(FADER_BARS/2)+2;
@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
wbkgd(faderWin,COLOR_PAIR(1)|A_BOLD);
box(faderWin,0,0);
wattrset(faderWin,COLOR_PAIR(9)|A_BOLD);
@@ -201,6 +207,7 @@
@@ -201,6 +207,7 @@ void display_volume(int ch1_volume_pos,i
getmaxyx(volumeWin,maxY,maxX);
centre=(VOLUME_BARS/2)+2;
@ -99,7 +99,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
wbkgd(volumeWin,COLOR_PAIR(1)|A_BOLD);
box(volumeWin,0,0);
if(bar==VOLBAR)mvwaddstr(volumeWin,maxY-1,maxX-9,"[Active]");
@@ -263,6 +270,7 @@
@@ -263,6 +270,7 @@ void display_speed(int ch1_speed_pos, in
getmaxyx(speedWin,maxY,maxX);
centre=(SPEED_BARS/2)+2;
@ -107,7 +107,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
wbkgd(speedWin,COLOR_PAIR(1)|A_BOLD);
box(speedWin,0,0);
if(bar==SPDBAR)mvwaddstr(speedWin,maxY-1,maxX-9,"[Active]");
@@ -323,6 +331,7 @@
@@ -323,6 +331,7 @@ void display_speed(int ch1_speed_pos, in
void display_player_status(int sim_play, int playmode)
{
@ -115,7 +115,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
wbkgd(pStatusWin,COLOR_PAIR(1)|A_BOLD);
box(pStatusWin,0,0);
wattrset(pStatusWin,COLOR_PAIR(9)|A_BOLD);
@@ -343,54 +352,6 @@
@@ -343,54 +352,6 @@ void gui_exit(void)
exit(0);
} /*gui_exit/*/
@ -170,7 +170,7 @@ $NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $
void create_windows()
{
int maxY, maxX, height, width, origY=1, origX=0;
@@ -398,10 +359,7 @@
@@ -398,10 +359,7 @@ void create_windows()
getmaxyx(stdscr,maxY,maxX);
height = maxY-4; width = (maxX/10)*7;
chWin = newwin(height,width,origY,origX);

14
audio/emixer/patches/patch-nctgui.h Normal file
View file

@ -0,0 +1,14 @@
$NetBSD: patch-nctgui.h,v 1.1 2013/10/14 13:33:31 roy Exp $
--- nctgui.h.orig 1999-12-28 00:47:02.000000000 +0000
+++ nctgui.h
@@ -8,8 +8,7 @@
*/
/* include files used by gui.c and main.c */
-#include <ncurses.h>
-#include <slang/slang.h>
+#include <curses.h>
#include <string.h>
/* defines used by gui.c and main.c */