Attachment 4182 Details for Bug 10797 – file.diff

[patch] file.diff

file.diff (text/plain), 7.46 KB, created by jim on 1999-03-26 07:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jim

Created: 1999-03-26 07:00:01 UTC

Size: 7.46 KB

patch

obsolete

>diff -ruN ascd/Makefile ascd-0.10.1/Makefile
>--- ascd/Makefile	Mon Mar 22 12:13:50 1999
>+++ ascd-0.10.1/Makefile	Fri Mar 26 15:03:31 1999
>@@ -1,14 +1,16 @@
> # New ports collection makefile for:	ascd
>-# Version required:		0.9.3
>+# Version required:		0.10.1
> # Date created:			29 November 1998
> # Whom:				Jim Mock <jim@phrantic.phear.net>
> #
> # $Id: Makefile,v 1.6 1999/03/08 20:06:04 fenner Exp $
> #
> 
>-DISTNAME=	ascd-0.9.3
>+DISTNAME=	ascd-0.10.1+lib
>+PKGNAME=	ascd-0.10.1
> CATEGORIES=	audio afterstep windowmaker
> MASTER_SITES=	http://worldserver.oleane.com/rsn/Archives/
>+EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	jim@phrantic.phear.net
> 
>@@ -16,18 +18,5 @@
> 
> USE_IMAKE=	yes
> MAN1=		ascd.1
>-
>-do-build:
>-	(cd ${WRKSRC} && make)
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/ascd/ascd ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/ascd/ascd.man \
>-		${PREFIX}/man/man1/ascd.1
>-	${GZIP_CMD} ${PREFIX}/man/man1/ascd.1
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${PREFIX}/share/doc/ascd
>-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/ascd
>-.endif
> 
> .include <bsd.port.mk>
>diff -ruN ascd/files/md5 ascd-0.10.1/files/md5
>--- ascd/files/md5	Mon Mar 22 12:13:49 1999
>+++ ascd-0.10.1/files/md5	Fri Mar 26 11:05:37 1999
>@@ -1 +1 @@
>-MD5 (ascd-0.9.3.tar.gz) = 4a2e36d07bf6e1ccfb1b1cf0c31d58c2
>+MD5 (ascd-0.10.1+lib.tgz) = 3b1984002cb5c9a76b7ead45b8692fdd
>diff -ruN ascd/patches/patch-aa ascd-0.10.1/patches/patch-aa
>--- ascd/patches/patch-aa	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-aa	Fri Mar 26 12:47:20 1999
>@@ -0,0 +1,11 @@
>+--- libworkman/wm_helpers.c.orig	Fri Mar 26 12:46:21 1999
>++++ libworkman/wm_helpers.c	Fri Mar 26 12:46:34 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>
>diff -ruN ascd/patches/patch-ab ascd-0.10.1/patches/patch-ab
>--- ascd/patches/patch-ab	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-ab	Fri Mar 26 12:50:42 1999
>@@ -0,0 +1,11 @@
>+--- ascd-0.10.1/ext.h.orig	Fri Mar 26 12:48:18 1999
>++++ ascd-0.10.1/ext.h	Fri Mar 26 12:50:22 1999
>+@@ -19,7 +19,7 @@
>+ #include "config.h"
>+ 
>+ #include "ascd.h"
>+-#include <workman/workman.h>
>++#include <../libworkman/include/workman.h>
>+ 
>+ #ifdef MIXER
>+ # if defined (__FreeBSD__)
>diff -ruN ascd/patches/patch-ac ascd-0.10.1/patches/patch-ac
>--- ascd/patches/patch-ac	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-ac	Fri Mar 26 12:56:04 1999
>@@ -0,0 +1,45 @@
>+--- ascd-0.10.1/ascd.c.orig	Fri Mar 26 12:51:21 1999
>++++ ascd-0.10.1/ascd.c	Fri Mar 26 12:55:25 1999
>+@@ -54,7 +54,7 @@
>+ #include "config.h"
>+ 
>+ #include "ascd.h"
>+-#include <workman/workman.h>
>++#include <../libworkman/include/workman.h>
>+ 
>+ #ifdef MIXER
>+ # if defined (__FreeBSD__)
>+@@ -1319,9 +1319,9 @@
>+     int Ret;
>+ 
>+ 
>+-#include "pixmaps/default/alpha.xpm"
>+-#include "pixmaps/default/led.xpm"
>+-#include "pixmaps/default/bar.xpm"
>++#include "pixmaps/base/alpha.xpm"
>++#include "pixmaps/base/led.xpm"
>++#include "pixmaps/base/bar.xpm"
>+ 
>+     /* the displays: */
>+     
>+@@ -1359,13 +1359,13 @@
>+ 
>+     /* The pixmap definition files: */
>+ 
>+-#include "pixmaps/default/back.xpm"
>+-#include "pixmaps/default/eject.xpm"
>+-#include "pixmaps/default/fwd.xpm"
>+-#include "pixmaps/default/pause.xpm"
>+-#include "pixmaps/default/play.xpm"
>+-#include "pixmaps/default/rew.xpm"
>+-#include "pixmaps/default/stop.xpm"
>++#include "pixmaps/base/back.xpm"
>++#include "pixmaps/base/eject.xpm"
>++#include "pixmaps/base/fwd.xpm"
>++#include "pixmaps/base/pause.xpm"
>++#include "pixmaps/base/play.xpm"
>++#include "pixmaps/base/rew.xpm"
>++#include "pixmaps/base/stop.xpm"
>+ 
>+     XGetWindowAttributes(Disp,Root,&Attributes);
>+ 
>diff -ruN ascd/patches/patch-ad ascd-0.10.1/patches/patch-ad
>--- ascd/patches/patch-ad	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-ad	Fri Mar 26 15:08:18 1999
>@@ -0,0 +1,17 @@
>+--- ascd-0.10.1/Imakefile.orig	Fri Mar 19 23:53:35 1999
>++++ ascd-0.10.1/Imakefile	Fri Mar 26 15:07:34 1999
>+@@ -1,10 +1,10 @@
>+ #include "config.h"
>+ 
>+ NAME 		= ascd
>+-BINDIR		= /usr/local/bin
>+-LIBDIR		= /usr/local/lib
>+-MANDIR		= /usr/local/man/man1
>+-MOREFLAGS	= -I/usr/local/include -I.
>++BINDIR		= /usr/X11R6/bin
>++LIBDIR		= /usr/X11R6/lib
>++MANDIR		= /usr/X11R6/man/man1
>++MOREFLAGS	= -I/usr/X11R6/include -I.
>+ CCOPTIONS	= $(MOREFLAGS)
>+ SYS_LIBRARIES	= $(XLIB) -lXpm
>+ 
>diff -ruN ascd/patches/patch-ae ascd-0.10.1/patches/patch-ae
>--- ascd/patches/patch-ae	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-ae	Fri Mar 26 15:23:12 1999
>@@ -0,0 +1,22 @@
>+--- libworkman/Config.orig	Fri Mar 26 15:22:15 1999
>++++ libworkman/Config	Fri Mar 26 15:22:36 1999
>+@@ -33,16 +33,16 @@
>+ XCOMM -------------------------------------------------------------------
>+ XCOMM                        Directory Prefix
>+ XCOMM -------------------------------------------------------------------
>+-DESTDIR=/usr/local/
>++DESTDIR=/usr/X11R6/
>+ 
>+ XCOMM -------------------------------------------------------------------
>+ XCOMM          LibWorkMan include file target relative to DSTDIR
>+ XCOMM -------------------------------------------------------------------
>+-WMINCDIR=/usr/local/include/workman
>++WMINCDIR=/usr/X11R6/include/workman
>+ 
>+ 
>+ 
>+ XCOMM -------------------------------------------------------------------
>+ #define SHARED_LIBWORKMAN
>+-LIBDIR=/usr/local/lib
>++LIBDIR=/usr/X11R6/lib
>+ 
>diff -ruN ascd/patches/patch-af ascd-0.10.1/patches/patch-af
>--- ascd/patches/patch-af	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-af	Fri Mar 26 15:51:09 1999
>@@ -0,0 +1,22 @@
>+--- config.lib.orig	Fri Mar 26 15:50:07 1999
>++++ config.lib	Fri Mar 26 15:50:30 1999
>+@@ -33,16 +33,16 @@
>+ XCOMM -------------------------------------------------------------------
>+ XCOMM                        Directory Prefix
>+ XCOMM -------------------------------------------------------------------
>+-DESTDIR=/usr/local/
>++DESTDIR=/usr/X11R6/
>+ 
>+ XCOMM -------------------------------------------------------------------
>+ XCOMM          LibWorkMan include file target relative to DSTDIR
>+ XCOMM -------------------------------------------------------------------
>+-WMINCDIR=/usr/local/include/workman
>++WMINCDIR=/usr/X11R6/include/workman
>+ 
>+ 
>+ 
>+ XCOMM -------------------------------------------------------------------
>+ #define SHARED_LIBWORKMAN
>+-LIBDIR=/usr/local/lib
>++LIBDIR=/usr/X11R6/lib
>+ 
>diff -ruN ascd/patches/patch-ag ascd-0.10.1/patches/patch-ag
>--- ascd/patches/patch-ag	Thu Jan  1 10:00:00 1970
>+++ ascd-0.10.1/patches/patch-ag	Fri Mar 26 17:19:49 1999
>@@ -0,0 +1,11 @@
>+--- libworkman/Imakefile.orig	Fri Mar 26 17:16:57 1999
>++++ libworkman/Imakefile	Fri Mar 26 17:18:28 1999
>+@@ -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 = 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 \
>diff -ruN ascd/pkg/PLIST ascd-0.10.1/pkg/PLIST
>--- ascd/pkg/PLIST	Mon Mar 22 12:13:50 1999
>+++ ascd-0.10.1/pkg/PLIST	Fri Mar 26 16:39:46 1999
>@@ -1,3 +1,17 @@
> bin/ascd
>-share/doc/ascd/README
>-@dirrm share/doc/ascd
>+lib/libworkman.so
>+lib/libworkman.so.1
>+include/workman/wm_cdda.h
>+include/workman/wm_cdinfo.h
>+include/workman/wm_cdrom.h
>+include/workman/wm_config.h
>+include/workman/wm_database.h
>+include/workman/wm_helpers.h
>+include/workman/wm_index.h
>+include/workman/wm_platform.h
>+include/workman/wm_scsi.h
>+include/workman/wm_struct.h
>+include/workman/wm_version.h
>+include/workman/workman.h
>+include/workman/workman_defs.h
>+@dirrm include/workman

Actions: View | Diff

Attachments on bug 10797: 4182