8 files changed, 149 insertions, 74 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 130c0a734cae..7fbc27c99eef 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	imake
-PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTVERSION=	4.5.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	XFree86-4.4.0-src-1.tgz \
-		XFree86-4.4.0-src-3.tgz
+DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
+		XFree86-${PORTVERSION}-src-3.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from XFree86
@@ -21,7 +20,7 @@ CONFLICTS=	imake-6*
 
 PREFIX?=	${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-USE_PERL5=	YES
+USE_PERL5=	yes
 USE_REINPLACE=	yes
 
 .ifdef USE_IMAKE
@@ -36,7 +35,6 @@ IGNORE=		is part of XFree86-4
 
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
-PATCH_DIST_ARGS=	--force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
 MAN1=		ccmakedep.1 \
 		cleanlinks.1 \
 		gccmakedep.1 \
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index 0559e773d23a..7cd266868d78 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1,4 +1,4 @@
-MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
-SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
-MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
-SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
+MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712
+SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331
+MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb
+SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763
diff --git a/devel/imake-4/files/patch-Imake.rules b/devel/imake-4/files/patch-Imake.rules
new file mode 100644
index 000000000000..cce69202137c
--- /dev/null
+++ b/devel/imake-4/files/patch-Imake.rules
@@ -0,0 +1,139 @@
+--- cf/Imake.rules.orig	Sun Jun  5 02:56:52 2005
++++ cf/Imake.rules	Sun Jun  5 02:56:37 2005
+@@ -1198,7 +1198,7 @@
+ 
+ #ifndef InstallNamedTarget
+ #define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
+-step::									@@\
++step:: srcname								@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	InstallNamedInline(srcname,flags,dest,dstname)
+ #endif /* InstallNamedTarget */
+@@ -1211,7 +1211,7 @@
+  */
+ #ifndef InstallNamedTargetNoClobber
+ #define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname)	@@\
+-step::									@@\
++step:: srcname								@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	@if [ -f $(DESTDIR)dest/dstname ]; then \			@@\
+ 	 echo "Not overwriting existing" $(DESTDIR)dest/dstname; \	@@\
+@@ -1233,7 +1233,7 @@
+  */
+ #ifndef InstallLibrary
+ #define	InstallLibrary(libname,dest)					@@\
+-install::								@@\
++install:: LibraryTargetName(libname)					@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\
+ 	RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname))
+@@ -1278,7 +1278,7 @@
+  */
+ #ifndef MergeIntoInstalledLibrary
+ #define MergeIntoInstalledLibrary(tolib,fromlib)			@@\
+-install::								@@\
++install::  fromlib							@@\
+ 	$(SCRIPTSRC)/mergelib $(DESTDIR)tolib fromlib
+ #endif /* MergeIntoInstalledLibrary */
+ 
+@@ -1350,7 +1350,7 @@
+ 									@@\
+ CppManTarget(file, $(EXTRAMANDEFS))					@@\
+ 									@@\
+-install.man::								@@\
++install.man:: file.$(MANNEWSUFFIX)					@@\
+ 	MakeDir($(DESTDIR)destdir)					@@\
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \		@@\
+ 		$(DESTDIR)destdir/dest.suffix
+@@ -1382,7 +1382,7 @@
+ 									@@\
+ CppManTarget(file, $(EXTRAMANDEFS))					@@\
+ 									@@\
+-install.man::								@@\
++install.man:: file.$(MANNEWSUFFIX)					@@\
+ 	MakeDir($(DESTDIR)destdir)					@@\
+ 	$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*			@@\
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \		@@\
+@@ -1396,7 +1396,7 @@
+ 									@@\
+ CppManTarget(file, $(EXTRAMANDEFS))					@@\
+ 									@@\
+-install.man::								@@\
++install.man:: file.$(MANNEWSUFFIX)					@@\
+ 	MakeDir($(DESTDIR)destdir)					@@\
+ 	$(RM) $(DESTDIR)destdir/dest.suffix*				@@\
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \		@@\
+@@ -1406,7 +1406,7 @@
+ 
+ #ifndef InstallMultipleMan
+ #define InstallMultipleMan(list,dest)					@@\
+-install.man::								@@\
++install.man:: list							@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
+ 	for i in list; do \						@@\
+@@ -1507,9 +1507,9 @@
+ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency		@@\
+ 	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
+ 	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \		@@\
+-	  > dest.suffix-html) && $(MV) dest.suffix-html $@		@@\
++	  > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html	@@\
+ 									@@\
+-install.man::								@@\
++install.man:: dest.suffix.html						@@\
+ 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
+ 	@(SUF=`expr suffix \: '\(.\)'`; \				@@\
+ 	 set -x; \							@@\
+@@ -1525,7 +1525,7 @@
+ #ifndef InstallHtmlManPageAliases
+ #if BuildHtmlManPages
+ #define InstallHtmlManPageAliases(file,aliases,suffix)			@@\
+-install.man::								@@\
++install.man:: file.suffix.html						@@\
+ 	@SUF=`expr suffix \: '\(.\)'`; \				@@\
+ 	for i in aliases; do (set -x; \					@@\
+ 	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \		@@\
+@@ -1616,7 +1616,7 @@
+  */
+ #ifndef InstallNonExec
+ #define	InstallNonExec(file,dest)					@@\
+-install::								@@\
++install:: file								@@\
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) file $(DESTDIR)dest
+ #endif /* InstallNonExec */
+ 
+@@ -1756,7 +1756,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath/mdir))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \			@@\
+-	  RELPATH=`echo opath/cdir | \					@@\
++	  RELPATH=`cd opath/cdir; pwd | \				@@\
+ 		sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
+ 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
+ 	  if [ -d rdir -a ! -h rdir ]; then \				@@\
+@@ -1803,7 +1803,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
+-	  RELPATH=`echo opath | \					@@\
++	  RELPATH=`cd opath; pwd | \					@@\
+ 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
+ 	  cd Concat($(DESTDIR),opath); \				@@\
+ 	  if [ -f lfile -a ! -h lfile ]; then \				@@\
+@@ -3607,14 +3607,14 @@
+  */
+ #ifndef InstallDynamicModule
+ #define InstallDynamicModule(module,dest,subdir)			@@\
+-install:: 								@@\
++install:: module							@@\
+ 	MakeDir($(DESTDIR)dest/subdir)					@@\
+ 	$(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir
+ #endif
+ 
+ #ifndef InstallDynamicNamedModule
+ #define InstallDynamicNamedModule(module,instname,dest,subdir)		@@\
+-install::								@@\
++install:: module							@@\
+ 	MakeDir($(DESTDIR)dest/subdir)					@@\
+ 	$(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir/instname
+ #endif
diff --git a/devel/imake-4/files/patch-amd64 b/devel/imake-4/files/patch-amd64
deleted file mode 100644
index 7e786cf3d680..000000000000
--- a/devel/imake-4/files/patch-amd64
+++ /dev/null
@@ -1,22 +0,0 @@
---- imake/imakemdep.h.orig	Mon Dec 29 20:53:52 2003
-+++ imake/imakemdep.h	Tue Mar  2 11:05:16 2004
-@@ -374,6 +374,9 @@
- # ifdef __AMD64__
- 	"-D__AMD64__",
- # endif
-+# ifdef __amd64__
-+	"-D__amd64__",
-+# endif
- # ifdef __x86_64__
- 	"-D__AMD64__",
- # endif
-@@ -1271,6 +1274,9 @@
- # if defined (__AMD64__) || defined (__x86_64__)
- 	{"__AMD64__", "1"},
- 	{"__x86_64__", "1"},
-+# endif
-+# if defined (__amd64__)
-+	{"__amd64__", "1"},
- # endif
- # ifdef __i386
- 	{"__i386", "1"},
diff --git a/devel/imake-4/files/patch-cf-Imakefile b/devel/imake-4/files/patch-cf-Imakefile
deleted file mode 100644
index a767e900338f..000000000000
--- a/devel/imake-4/files/patch-cf-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- cf/Imakefile.orig	Sun Nov  9 01:41:04 2003
-+++ cf/Imakefile	Sun Nov  9 01:41:05 2003
-@@ -77,7 +77,8 @@
- sunLib.tmpl \
- sv3Lib.tmpl \
- sv4Lib.tmpl \
--xf86.tmpl
-+xf86.tmpl \
-+xttMod.tmpl
- 
- CFFILES = \
- Imake.cf \
diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h
deleted file mode 100644
index ec57f029eeb9..000000000000
--- a/devel/imake-4/files/patch-h
+++ /dev/null
@@ -1,29 +0,0 @@
---- cf/Imake.rules.orig	Tue Dec 18 05:00:37 2001
-+++ cf/Imake.rules	Mon Jan 21 02:34:48 2002
-@@ -1399,7 +1399,7 @@
- dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency		@@\
- 	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
- 	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \		@@\
--	  > dest.suffix-html) && $(MV) dest.suffix-html $@		@@\
-+	  > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html	@@\
- 									@@\
- install.man:: dest.suffix.html						@@\
- 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
-@@ -1644,7 +1644,7 @@
- 	MakeDir(Concat($(DESTDIR),npath/mdir))				@@\
- 	@MakeFlagsToShellFlags(i,set +e); \				@@\
- 	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \			@@\
--	  RELPATH=`echo opath/cdir | \					@@\
-+	  RELPATH=`cd opath/cdir; pwd | \				@@\
- 		sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
- 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
- 	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
-@@ -1691,7 +1691,7 @@
- 	MakeDir(Concat($(DESTDIR),npath))				@@\
- 	@MakeFlagsToShellFlags(i,set +e); \				@@\
- 	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
--	  RELPATH=`echo opath | \					@@\
-+	  RELPATH=`cd opath; pwd | \					@@\
- 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
- 	  cd Concat($(DESTDIR),opath); \				@@\
- 	  if [ -f lfile -a ! -h lfile ]; then \ 			@@\
diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist
index 261dbcb08bf0..821776a84b32 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -118,4 +118,4 @@ lib/X11/config/xf86.rules
 lib/X11/config/xf86.tmpl
 lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
-lib/X11/config/xttMod.tmpl
+@dirrm lib/X11/config
diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
index d4fd250860b1..8a2337008f75 100644
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@@ -47,6 +47,7 @@ echo "#define HasFontconfig YES"		>> $F
 echo "#define FontconfigDir ${PREFIX}"		>> $F
 echo "#define HasLibpng YES"			>> $F
 echo "#define LibpngDir ${LOCALBASE}"		>> $F
+echo "#define DocDir ${PREFIX}/share/doc/XFree86"	>> $F
 echo "#define BuildHtmlManPages NO"		>> $F
 # Never install something to outside ${X11BASE}
 echo "#define NothingOutsideProjectRoot YES"	>> $F