Attachment 25573 Details for Bug 43686 – file.diff

[patch] file.diff

file.diff (text/plain), 4.77 KB, created by tkato on 2002-10-05 09:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-10-05 09:10:03 UTC

Size: 4.77 KB

patch

obsolete

>diff -urN /usr/ports/x11/tycoon/Makefile x11/tycoon/Makefile
>--- /usr/ports/x11/tycoon/Makefile	Tue Sep 10 20:33:20 2002
>+++ x11/tycoon/Makefile	Sat Oct  5 16:21:37 2002
>@@ -13,15 +13,18 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms
>+LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
> 
>-USE_REINPLACE=	yes
> USE_IMAKE=	yes
> USE_XPM=	yes
>+USE_REINPLACE=	yes
>+REINPLACE_ARGS=	-i ""
> 
>-post-build:
>-	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~ ;\
>+post-patch:
>+	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~
> 	${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
> 		${WRKSRC}/xbackdrop/backdrops/index
>+	${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \
>+		's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g'
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11/tycoon/files/patch-aa x11/tycoon/files/patch-aa
>--- /usr/ports/x11/tycoon/files/patch-aa	Sun Dec 31 03:37:03 2000
>+++ x11/tycoon/files/patch-aa	Sat Oct  5 15:39:13 2002
>@@ -10,12 +10,12 @@
> -XCOMM FOR Solaris
> -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
> +XCOMM FOR FreeBSD
>-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
>++EXTRA_LIBRARIES  = -lforms -lXpm -lm
>  
>  
> -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
> -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
>-+EXTRA_INCLUDES  = -I.
>++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
> +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
>  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
>  
>diff -urN /usr/ports/x11/tycoon/files/patch-ab x11/tycoon/files/patch-ab
>--- /usr/ports/x11/tycoon/files/patch-ab	Sun Dec 31 03:37:03 2000
>+++ x11/tycoon/files/patch-ab	Sat Oct  5 15:39:20 2002
>@@ -7,7 +7,7 @@
> -EXTRA_LIBRARIES  = -L/usr/local/lib -L/users/matar/interu/segel/mitnits/lib -lXpm
> -EXTRA_INCLUDES  = -I/usr/local/include -I/users/matar/interu/segel/mitnits/lib -I.
> +EXTRA_LIBRARIES  = -lXpm
>-+EXTRA_INCLUDES  = -I.
>++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
>  EXTRA_DEFINES = -DVERSION=\"$(VERSION)\"
>  LDLIBS = $(EXTRA_LIBRARIES) $(XAWLIB) $(XMULIB) \
>  	$(XTOOLLIB) $(EXTENSIONLIB) $(XLIB) 
>diff -urN /usr/ports/x11/tycoon/files/patch-ac x11/tycoon/files/patch-ac
>--- /usr/ports/x11/tycoon/files/patch-ac	Mon Jun  4 18:33:50 2001
>+++ x11/tycoon/files/patch-ac	Sat Oct  5 15:39:32 2002
>@@ -16,11 +16,11 @@
> -XCOMM FOR Solaris
> -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
> +XCOMM FOR FreeBSD
>-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
>++EXTRA_LIBRARIES  = -lforms -lXpm -lm
>  
>  
> -EXTRA_INCLUDES = -I/usr/local/include -I/u/grad/mitnits/lib -I.
>-+EXTRA_INCLUDES = -I.
>++EXTRA_INCLUDES = -I. -I${INCDIR}/X11
>  EXTRA_DEFINES =  -DXBACKDROP_DIR=\"$(XBACKDROP_DIR)\"
>  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
>  
>diff -urN /usr/ports/x11/tycoon/files/patch-ad x11/tycoon/files/patch-ad
>--- /usr/ports/x11/tycoon/files/patch-ad	Sun Dec 31 03:37:03 2000
>+++ x11/tycoon/files/patch-ad	Sat Oct  5 15:39:40 2002
>@@ -10,12 +10,12 @@
> -XCOMM FOR Solaris
> -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
> +XCOMM FOR FreeBSD
>-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
>++EXTRA_LIBRARIES  = -lforms -lXpm -lm
>  
>  
> -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
> -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
>-+EXTRA_INCLUDES  = -I.
>++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
> +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
>  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
>  
>diff -urN /usr/ports/x11/tycoon/files/patch-ae x11/tycoon/files/patch-ae
>--- /usr/ports/x11/tycoon/files/patch-ae	Sun Dec 31 03:37:03 2000
>+++ x11/tycoon/files/patch-ae	Sat Oct  5 15:39:48 2002
>@@ -7,8 +7,8 @@
> -EXTRA_LIBRARIES  = -L/usr/local/lib -lforms -lXpm -lm
> -EXTRA_INCLUDES  = -I/usr/local/include -I.
> -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
>-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
>-+EXTRA_INCLUDES  = -I.
>++EXTRA_LIBRARIES  = -lforms -lXpm -lm
>++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
> +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
>  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
>  
>diff -urN /usr/ports/x11/tycoon/files/patch-af x11/tycoon/files/patch-af
>--- /usr/ports/x11/tycoon/files/patch-af	Sun Dec 31 03:37:03 2000
>+++ x11/tycoon/files/patch-af	Sat Oct  5 15:39:56 2002
>@@ -10,12 +10,12 @@
> -XCOMM FOR Solaris
> -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
> +XCOMM FOR FreeBSD
>-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm 
>++EXTRA_LIBRARIES  = -lforms -lXpm -lm 
>  
>  
> -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
> -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
>-+EXTRA_INCLUDES  = -I.
>++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
> +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
>  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)

Actions: View | Diff

Attachments on bug 43686: 25573