3 files changed, 36 insertions, 28 deletions

diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 04304c5d32af..a980b681e520 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -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$
 #
@@ -9,19 +9,27 @@ PORTNAME=	vcg
 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 --git a/graphics/vcg/files/conf b/graphics/vcg/files/conf
index e49ee2b3eef8..0f697b21356d 100644
--- a/graphics/vcg/files/conf
+++ b/graphics/vcg/files/conf
@@ -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 @@ FIGTOPSTOTEXNAME|fig2ps2tex
 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 --git a/graphics/vcg/files/tMakefile b/graphics/vcg/files/tMakefile
index 44e662b51efa..aa43268f6a84 100644
--- a/graphics/vcg/files/tMakefile
+++ b/graphics/vcg/files/tMakefile
@@ -38,12 +38,12 @@ SHELL = /bin/sh
 # 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 @@ VCGCALL   = $(BINDIR)/$(VCGTOOL)
 #
 # 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 @@ CLINKFLAGS = -o
 # 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 @@ INCLUDES = -I/usr/X11R6/include/
 # 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 @@ LIBRARIES = -lXext -lX11 -lm
 
 # 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 @@ INSTALLDIR = /bin/mkdir -p
 # 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 @@ YACC     = not_needed
 
 # Make
 # MAKE     = make
-MAKE = make
+MAKE = %%MAKE%%
 
 # MakeDepend (should understand the -f option)
 # DEPEND   = makedepend