Attachment 10832 Details for Bug 21579 – file.diff

[patch] file.diff

file.diff (text/plain), 5.16 KB, created by tkato on 2000-09-26 23:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-09-26 23:20:02 UTC

Size: 5.16 KB

patch

obsolete

>diff -urN /usr/ports/graphics/vcg/Makefile graphics/vcg/Makefile
>--- /usr/ports/graphics/vcg/Makefile	Sat Apr 15 00:25:44 2000
>+++ graphics/vcg/Makefile	Wed Sep 27 07:05:02 2000
>@@ -1,6 +1,6 @@
>-# New ports collection makefile for: vcg
>-# Date created: 19 February 1995
>-# Whom: hsu
>+# New ports collection makefile for:	vcg
>+# Date created:		19 February 1995
>+# Whom:			hsu
> #
> # $FreeBSD: ports/graphics/vcg/Makefile,v 1.11 2000/04/14 10:47:38 asami Exp $
> #
>@@ -9,19 +9,27 @@
> PORTVERSION=	1.30
> CATEGORIES=	graphics
> MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
>-DISTNAME=	vcg.1.30
>-DISTFILES=	vcg.1.30.r3.17.tgz
>+DISTNAME=	${PORTNAME}.${PORTVERSION}
>+EXTRACT_SUFX=	.r3.17.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
>+
> USE_X_PREFIX=	yes
> MANL=		pbmrot90.l pbmshift.l pbm2hp.l vcgdemomaker.l vcg.l xvcg.l
> 
> pre-patch:
> 	@${MKDIR} ${WRKSRC}/preconf/X11ccFreeBSD
>-	@${CP} ${FILESDIR}/conf ${WRKSRC}/preconf/X11ccFreeBSD
>-	@${CP} ${FILESDIR}/demo.csh ${WRKSRC}/preconf/X11ccFreeBSD
>-	@${CP} ${FILESDIR}/globals.h ${WRKSRC}/preconf/X11ccFreeBSD
>-	@${CP} ${FILESDIR}/tMakefile ${WRKSRC}/preconf/X11ccFreeBSD
>+.for file in conf demo.csh globals.h tMakefile
>+	@${SED} -e "s:%%CC%%:${CC}:g" \
>+	        -e "s:%%CFLAGS%%:${CFLAGS}:g" \
>+	        -e "s:%%MAKE%%:${MAKE}:g;" \
>+	        -e "s:%%PREFIX%%:${PREFIX}:g" \
>+	        -e "s:%%X11BASE%%:${X11BASE}:g" \
>+	        -e "s:%%INSTALL_PROGRAM%%:${INSTALL_PROGRAM}:g" \
>+	        -e "s:%%INSTALL_MAN%%:${INSTALL_MAN}:g" \
>+		< ${FILESDIR}/${file} > ${WRKSRC}/preconf/X11ccFreeBSD/${file}
>+.endfor
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/vcg/files/conf graphics/vcg/files/conf
>--- /usr/ports/graphics/vcg/files/conf	Sun Feb 19 18:25:43 1995
>+++ graphics/vcg/files/conf	Wed Sep 27 06:27:57 2000
>@@ -1,16 +1,16 @@
>-ADDINCLUDEPATHNAME|-I/usr/X11R6/include/
>-ADDLIBPATHNAME|-L/usr/X11R6/lib/
>+ADDINCLUDEPATHNAME|-I%%X11BASE%%/include/
>+ADDLIBPATHNAME|-L%%X11BASE/lib/
> ADDLIBSNAME|-lXext -lX11 -lm
> ALIGNMENTNAME|8
> ANSINAME|#undef ANSI_C
> BIGLTEXNAME|not_available
>-BINPATHNAME|/usr/X11R6/bin
>+BINPATHNAME|%%PREFIX%%/bin
> BISONNAME|not_available
> BLOCKSIZENAME|1048576
> CATNAME|/bin/cat
>-CCLINKNAME|cc
>-CCNAME|cc
>-CFLAGSNAME|-c -O2 
>+CCLINKNAME|%%CC%%
>+CCNAME|%%CC%%
>+CFLAGSNAME|-c %%CFLAGS%%
> CLEARNAME|/usr/bin/clear
> CLINKFLAGSNAME|-o
> FGREPNAME|/usr/bin/fgrep
>@@ -19,15 +19,15 @@
> FLEXNAME|not_needed
> FONTALIASNAME|-*-courier-*-*-*--14-*-*-*-*-*-*-*
> INPUTFOCUSNAME|#define NOINPUTFOCUS
>-INSTALLBINNAME|/bin/install -c -s -m 755 dummy $(BINDIR)/dummy
>+INSTALLBINNAME|%%INSTALL_PROGRAM%% dummy $(BINDIR)/dummy
> INSTALLDIRNAME|/bin/mkdir -p
>-INSTALLMANNAME|/bin/install -c -m 644 dummy $(MANDIR)/dummy
>+INSTALLMANNAME|%%INSTALL_MAN%% dummy $(MANDIR)/dummy
> LATEXNAME|latex
> LNNAME|/bin/ln
> MAKEDEPENDNAME|makedepend
> MAKENAME|make
> MANEXTNAME|l
>-MANPATHNAME|/usr/X11R6/man/manl
>+MANPATHNAME|%%PREFIX%%/man/manl
> MVNAME|/bin/mv
> RMNAME|/bin/rm
> SEDNAME|/usr/bin/sed
>diff -urN /usr/ports/graphics/vcg/files/tMakefile graphics/vcg/files/tMakefile
>--- /usr/ports/graphics/vcg/files/tMakefile	Sun Aug 29 20:32:03 1999
>+++ graphics/vcg/files/tMakefile	Wed Sep 27 06:37:46 2000
>@@ -38,12 +38,12 @@
> # where the binaries go
> # BINDIR = /usr/local/bin/
> # BINDIR = /RW/esprit/users/sander/PUBLIC/CMD/
>-BINDIR = /usr/X11R6/bin
>+BINDIR = %%PREFIX%%/bin
> 
> # where the manual pages go
> # MANDIR = /usr/local/man/manl/
> # MANDIR = /RW/esprit/users/sander/PUBLIC/MAN/
>-MANDIR = /usr/X11R6/man/manl
>+MANDIR = %%PREFIX%%/man/manl
> 
> # what the manual extension is
> MANEXT = l
>@@ -78,7 +78,7 @@
> #
> # Do not use  -O -finline-functions for FreeBSD, or you really have a lot
> # of swap for compiling drawstr.c.
>-CFLAGS = -c -O2 -pipe
>+CFLAGS = -c %%CFLAGS%%
> 
> # Flags for debugging
> DFLAGS =
>@@ -104,7 +104,7 @@
> # then please use
> # INCLUDES = -I/usr/local/X11/include/
> # INCLUDES = -I/RW/esprit/X11R5/include/
>-INCLUDES = -I/usr/X11R6/include/
>+INCLUDES = -I%%X11BASE%%/include/
> 
> # Library directories
> # For Sunview, this should be enough, because on Suns, Sunview
>@@ -117,7 +117,7 @@
> # then please use
> # LIBPATH = -L/usr/local/X11/lib/
> # LIBPATH = -L/RW/esprit/X11R5/lib/
>-LIBPATH = -L/usr/X11R6/lib/
>+LIBPATH = -L%%X11BASE%%/lib/
> 
> # Libraries
> # Libraries for SunView
>@@ -131,11 +131,11 @@
> 
> # C compiler
> # CC = gcc -pipe
>-CC = cc
>+CC = %%CC%%
> 
> # C linker
> # CCLINK  = gcc -static
>-CCLINK = cc
>+CCLINK = %%CC%%
> 
> # If you use gcc and the sun driver, you need the normal sun
> # preprocessor because of incompatibilities of the system libraries
>@@ -154,12 +154,12 @@
> # For binary files:
> # Assume that you want to install s file called dummy.
> # INSTALL = /bin/install -s -m 755 dummy $(BINDIR)/dummy
>-INSTALL = /usr/bin/install -c -s -m 755 dummy $(BINDIR)/dummy
>+INSTALL = %%INSTALL_PROGRAM%% dummy $(BINDIR)/dummy
> 
> # For manual pages:
> # Assume that you want to install s file called dummy.
> # INSTALLMAN = /bin/install -m 644 dummy $(MANDIR)/dummy
>-INSTALLMAN = /usr/bin/install -c -m 644 dummy $(MANDIR)/dummy
>+INSTALLMAN = %%INSTALL_MAN%% dummy $(MANDIR)/dummy
> 
> # To make the documentation
> LATEX = latex
>@@ -203,7 +203,7 @@
> 
> # Make
> # MAKE     = make
>-MAKE = make
>+MAKE = %%MAKE%%
> 
> # MakeDepend (should understand the -f option)
> # DEPEND   = makedepend

Actions: View | Diff

Attachments on bug 21579: 10832