Attachment 7911 Details for Bug 16866 – file.diff

[patch] file.diff

file.diff (text/plain), 1.97 KB, created by tkato on 2000-02-21 14:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-02-21 14:00:02 UTC

Size: 1.97 KB

patch

obsolete

>diff -urN /usr/ports/astro/wmglobe/Makefile astro/wmglobe/Makefile
>--- /usr/ports/astro/wmglobe/Makefile	Thu Feb 17 20:12:16 2000
>+++ astro/wmglobe/Makefile	Mon Feb 21 20:51:33 2000
>@@ -14,12 +14,7 @@
> 
> MAINTAINER=	andrews@technologist.com
> 
>-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
>-		jpeg.9:${PORTSDIR}/graphics/jpeg \
>-		png.3:${PORTSDIR}/graphics/png \
>-		tiff.4:${PORTSDIR}/graphics/tiff \
>-		ungif.5:${PORTSDIR}/graphics/libungif \
>-		wraster.3:${PORTSDIR}/x11-wm/windowmaker
>+LIB_DEPENDS=	wraster.3:${PORTSDIR}/x11-wm/windowmaker
> 
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
>@@ -27,7 +22,7 @@
> MAN1=		wmglobe.1
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin/
>+	${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/wmglobe.1 ${PREFIX}/man/man1
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/astro/wmglobe/patches/patch-aa astro/wmglobe/patches/patch-aa
>--- /usr/ports/astro/wmglobe/patches/patch-aa	Thu Feb 17 20:12:17 2000
>+++ astro/wmglobe/patches/patch-aa	Mon Feb 21 20:51:14 2000
>@@ -1,12 +1,11 @@
>---- Makefile.orig	Tue Feb  2 12:11:37 1999
>-+++ Makefile	Sat Jun 26 01:23:37 1999
>-@@ -1,12 +1,12 @@
>+--- Makefile.orig	Wed Feb  3 05:11:37 1999
>++++ Makefile	Mon Feb 21 20:49:54 2000
>+@@ -1,12 +1,11 @@
> -INC	=	-I/usr/X11R6/include
> -LIBS	=	-lXext -lX11 -lm -L/usr/X11R6/lib \
> -		-ltiff  -lXpm -lpng -lz -ljpeg -lungif -lwraster
>-+INC	=	-I${X11BASE}/include
>-+LIBS	=	-lXext -lX11 -lm -L${X11BASE}/lib -L${LOCALBASE}/lib \
>-+		-ltiff  -lXpm -lpng -lz -ljpeg -lungif -lwraster
>++INC	=	`get-wraster-flags --cflags`
>++LIBS	=	`get-wraster-flags --libs`
>  OBJS	=	src/wmglobe.o src/rend.o src/wmgutil.o \
>  		src/sunpos.o src/myconvert.o src/mycontext.o 
>  
>@@ -17,12 +16,13 @@
>  
>  all:  wmglobe
>  
>-@@ -14,7 +14,7 @@
>+@@ -14,8 +13,7 @@
>  	rm -f src/*.o wmglobe
>  	
>  wmglobe :	$(OBJS)
> -		gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS)
>+-		strip wmglobe 
> +		${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS)
>- 		strip wmglobe 
>  
>  install :	
>+ 		install wmglobe /usr/local/bin

Actions: View | Diff

Attachments on bug 16866: 7911