Fix build with open-motif-2.3.3

PR:		ports/154044
Submitted by:	Mikhail Tsatsenko <m.tsatsenko at gmail.com>
Exp-runs by:	pav

16 files changed, 116 insertions, 42 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index e058b11b634f..894da9fe7db8 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xephem
 PORTVERSION=	3.7.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 
diff --git a/astro/xephem/files/patch-Makefile b/astro/xephem/files/patch-Makefile
index 425aabda6e13..5a80202f48c2 100644
--- a/astro/xephem/files/patch-Makefile
+++ b/astro/xephem/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-07-26 16:36:37.000000000 +0000
-+++ Makefile	2009-07-26 16:39:34.000000000 +0000
+--- Makefile.orig	2009-01-05 23:55:59.000000000 +0300
++++ Makefile	2011-04-13 20:07:51.559534154 +0400
 @@ -10,9 +10,9 @@
  # one executable, xephem.
  
@@ -31,11 +31,13 @@
  CLDFLAGS = -g
 -CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
 -LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
-+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include
+-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm
++CFLAGS = $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include
 +LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L%%LOCALBASE%%/lib
- XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
- LIBS = $(XLIBS) $(LIBLIB) -lm
- 
++XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 -lXft
++LIBS = $(XLIBS) $(LIBLIB) -lm -liconv
+
 @@ -189,10 +189,7 @@
  libs:
  	cd ../../libastro; make
diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index 82d999dee8eb..57a5af455278 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	praat
 PORTVERSION=	4.6.39
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio science
 MASTER_SITES=	http://personalpages.tds.net/~jwbacon/Ports/distfiles/
 DISTNAME=	praat4639_sources
diff --git a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
index 489ded221019..eb32db9867d2 100644
--- a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
+++ b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
@@ -8,7 +8,7 @@
 +CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized
  
 -LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm 
-+LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm
++LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg -liconv -lXft
  
  RANLIB = ls
  ICON =
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index 6b15b9e1cf8d..d890f2ab5275 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ncbi-toolkit
 PORTVERSION=	2009.03.01	# containing BLAST v2.2.19
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/${PORTVERSION:S/.//g}/
 DISTNAME=	ncbi
@@ -42,13 +43,6 @@ BLAST_EXE=	bl2seq blastall blastcl3 blastclust blastpgp copymat \
 X11_EXE=	Nentrez Psequin ddv entrez2 sbtedit udv
 
 # and these are the man pages we have
-MAN1=	asn2asn.1 asn2ff.1 asn2fsa.1 asn2gb.1 asn2idx.1	asn2xml.1 \
-	asndhuff.1 asnval.1 blast.1 blastclust.1 cdscan.1 checksub.1 \
-	copymat.1 ddv.1 debruijn.1 errhdr.1 fa2htgs.1 fastacmd.1 \
-	findspl.1 fmerge.1 formatdb.1 getmesh.1 getpub.1 gil2bin.1 \
-	idfetch.1 indexpub.1 makemat.1 makeset.1 sbtedit.1 tbl2asn.1 \
-	udv.1 vecscreen.1 Psequin.1 asn2all.1 asntool.1 entrez2.1 \
-	formatrpsdb.1
 MAN1=	Psequin.1 asn2all.1 asn2asn.1 asn2ff.1 asn2fsa.1 asn2gb.1 asn2idx.1 \
 	asn2xml.1 asndhuff.1 asntool.1 asnval.1 blast.1 blastclust.1 \
 	cdscan.1 checksub.1 copymat.1 ddv.1 \
diff --git a/biology/ncbi-toolkit/files/patch-make-makeall.unx b/biology/ncbi-toolkit/files/patch-make-makeall.unx
new file mode 100644
index 000000000000..2c46de62b96f
--- /dev/null
+++ b/biology/ncbi-toolkit/files/patch-make-makeall.unx
@@ -0,0 +1,13 @@
+--- make/makeall.unx.orig    2011-04-13 20:40:11.451542049 +0400
++++ make/makeall.unx 2011-04-13 20:41:03.081658892 +0400
+@@ -64,8 +64,8 @@
+ CC = cc
+ RAN = ls -l
+ AR=ar
+-OTHERLIBS = -lm
+-VIBLIBS = 
++OTHERLIBS = -lm -liconv
++VIBLIBS = -lXft -lpng -ljpeg
+ VIBFLAG =
+ LIBCOPY = cp -p
+ SRCCOPY = ./ln-if-absent
diff --git a/biology/ncbi-toolkit/files/patch-make-makenet.unx b/biology/ncbi-toolkit/files/patch-make-makenet.unx
new file mode 100644
index 000000000000..76d817d6c913
--- /dev/null
+++ b/biology/ncbi-toolkit/files/patch-make-makenet.unx
@@ -0,0 +1,58 @@
+--- make/makenet.unx.orig	2008-12-11 00:23:29.000000000 +0300
++++ make/makenet.unx	2011-04-14 00:26:38.440426134 +0400
+@@ -67,6 +67,7 @@
+ VIB =
+ VIBLIBS= -lXm -lXmu -lXt -lX11
+ VIBLIBS=
++USERLIBS = -lXft -lpng -ljpeg -liconv
+ SEQUIN_OPTS =
+ LIBCOPY = cp -p
+ SRCCOPY = ./ln-if-absent
+@@ -923,17 +924,17 @@
+ 	$(CC) -o ddv $(LDFLAGS) $(OBJDDV) $(LIB41) $(LIB31) $(LIB20) $(LIB61) $(LIB60) $(LIB22) $(LIB45) \
+ 	$(LIB8) $(LIB7) $(NETCLILIB) $(LIB3) $(LIB4) $(LIB23) \
+ 	$(LIBCOMPADJ) $(LIB2) $(LIB1) \
+-	$(VIBLIBS) $(OTHERLIBS)
++	$(VIBLIBS) $(OTHERLIBS) $(USERLIBS)
+ 
+ udv    : $(OBJUDV)
+ 	$(CC) -o udv $(LDFLAGS) $(OBJUDV) $(LIB41) $(LIB31) $(LIB20) $(LIB61) $(LIB60) $(LIB22) $(LIB45) \
+     $(LIB8) $(LIB7) $(NETCLILIB) $(LIB3) $(LIB4) \
+ 	$(LIB23) $(LIBCOMPADJ) $(LIB2) \
+-	$(LIB1) $(VIBLIBS) $(OTHERLIBS)
++	$(LIB1) $(VIBLIBS) $(OTHERLIBS) $(USERLIBS)
+ 
+ Nentrez : entrez.c $(ULIB31)
+ 	$(CC) -o Nentrez $(LDFLAGS) entrez.c $(LIB41) $(LIB31) $(LIB30) $(LIB20) $(LIB61) $(LIB60) $(LIB22) $(LIB45) \
+-    $(LIB36) $(LIB23) $(LIBCOMPADJ) $(LIB8) $(LIB7) $(NETCLILIB) $(LIB5) $(LIB4) $(LIB3) $(LIB2) $(LIB1) $(VIBLIBS) $(OTHERLIBS)
++    $(LIB36) $(LIB23) $(LIBCOMPADJ) $(LIB8) $(LIB7) $(NETCLILIB) $(LIB5) $(LIB4) $(LIB3) $(LIB2) $(LIB1) $(VIBLIBS) $(OTHERLIBS) $(USERLIBS)
+ 
+ # left this in (Tentrez) for script backwards compatibility
+ Tentrez : entrez.c $(ULIB31)
+@@ -1114,7 +1115,7 @@
+ entrez2 :	entrez2.c
+ 	$(CC) -g -o entrez2 $(LDFLAGS) entrez2.c $(LIB41) $(LIB6) $(LIB20) \
+ 		$(LIB61) $(LIB60) $(LIB22) $(LIB23) $(LIBCOMPADJ) \
+-		$(LIB2) $(LIB4) $(LIB1) $(VIBLIBS) $(OTHERLIBS)
++		$(LIB2) $(LIB4) $(LIB1) $(VIBLIBS) $(OTHERLIBS) $(USERLIBS)
+ 	$(VIB_POST_LINK) entrez2
+ 
+ # demo program (spidey)
+@@ -1383,7 +1384,7 @@
+ 	$(CC) -o Psequin -I. $(LDFLAGS) -UINTERNAL_NCBI_SEQUIN $(SRCSEQUIN) \
+ 	$(LIB30) $(LIB45) $(LIB31) $(LIB20) $(LIB61) $(LIB60) $(LIB22) \
+ 	$(LIB40) $(LIB41) $(LIB36) $(LIB23) $(LIBCOMPADJ) $(LIB11) \
+-	$(ENTREZLIBS) $(LIB4) $(LIB2) $(LIB1) $(VIBLIBS) $(OTHERLIBS)
++	$(ENTREZLIBS) $(LIB4) $(LIB2) $(LIB1) $(VIBLIBS) $(OTHERLIBS) $(USERLIBS)
+ 	$(VIB_POST_LINK) Psequin
+ 
+ # 'sbtedit' Submission Template Editor
+@@ -1395,7 +1396,7 @@
+ 	$(CC) -o sbtedit -I. $(LDFLAGS) -UINTERNAL_NCBI_SEQUIN $(SRCSBTEDIT) \
+ 	$(LIB30) $(LIB45) $(LIB31) $(LIB20) $(LIB61) $(LIB60) $(LIB22) \
+ 	$(LIB40) $(LIB41) $(LIB36) $(LIB23) $(LIBCOMPADJ) $(LIB11) \
+-	$(ENTREZLIBS) $(LIB4) $(LIB2) $(LIB1) $(VIBLIBS) $(OTHERLIBS)
++	$(ENTREZLIBS) $(LIB4) $(LIB2) $(LIB1) $(VIBLIBS) $(OTHERLIBS) $(USERLIBS)
+ 	$(VIB_POST_LINK) sbtedit
+ 
+ salogif.o:	salogif.c
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index e308616289b4..50aad21a0a72 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -25,8 +25,8 @@ PKGNAMESUFFIX+=	-canna
 DISTNAME=	xemacs-${XEMACS_VER:S/-b/./}
 DIST_SUBDIR=	xemacs
 
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	XEmacs(beta version) text editor with mule(Only the executables)
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	XEmacs(beta version) text editor with mule(Only the executables)
 
 CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
@@ -38,13 +38,17 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-devel-mule
 .endif
 .if !defined(WITHOUT_X11)
+BUILD_DEPENDS+=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
 
-USE_XORG+=	x11 xpm
-CONFIGURE_ARGS=	--with-xpm
+USE_XORG+=	x11 xft xpm
+CONFIGURE_ARGS=--with-xpm --with-xft=all
+# XXX: needed until port updated to work nicely with autoconf >= 2.64
+#      see files/patch-configure.ac for more details
+CFLAGS+=	-I${LOCALBASE}/include/freetype2
 .endif
 
 XEMACS_REL=	21.5
@@ -106,14 +110,7 @@ CONFIGURE_ARGS+=--disable-debug --disable-error-checking
 CONFIGURE_ARGS+=--disable-kkcc --disable-mc-alloc --disable-newgc
 .endif
 
-.if defined(WITH_XFT)
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_XORG+=	x11 xft xpm
-CONFIGURE_ARGS+=--with-xft=all
-# XXX: needed until port updated to work nicely with autoconf >= 2.64
-#      see files/patch-configure.ac for more details
-CFLAGS+=	-I${LOCALBASE}/include/freetype2
-.elif defined(WITH_GTK)
+.if defined(WITH_GTK)
 CONFIGURE_ARGS+=--with-gtk
 WITH_XIM=
 WITH_MENUBARS=	--enable-menubars=gtk
@@ -121,8 +118,6 @@ WITH_SCROLLBARS=--enable-scrollbars=gtk
 WITH_DIALOGS=	--enable-dialogs=gtk
 WITH_WIDGETS=	--enable-widgets=gtk
 USE_GNOME+=	gtk12
-.else
-CONFIGURE_ARGS+=--with-xfs
 .endif
 
 PKGDIR=		${.CURDIR}/../../editors/xemacs-devel-mule
@@ -131,7 +126,7 @@ PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_XFT) && ${OSVERSION} >= 900000
+.if ${OSVERSION} >= 900000
 BROKEN=		does not build on FreeBSD 9.X
 .endif
 
@@ -208,12 +203,12 @@ PLIST_SUB+=	WITH_LDAP="@comment "
 BINNAMEEXT=		-mule
 .if defined(CANNA) && defined(FREEWNN)
 CONFIGURE_ARGS+=	--with-canna --with-wnn --with-wnn6=no
-LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna \
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib \
 			wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .elif defined(CANNA) && defined(WNN6)
 SITE_INCLUDES=		${LOCALBASE}/include/wnn6
 CONFIGURE_ARGS+=	--with-canna --with-wnn6
-LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna \
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib \
 			wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
 .elif defined(FREEWNN)
 CONFIGURE_ARGS+=	--with-wnn --with-canna=no --with-wnn6=no
@@ -224,7 +219,7 @@ CONFIGURE_ARGS+=	--with-wnn6 --with-canna=no
 LIB_DEPENDS+=		wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
 .elif defined(CANNA)
 CONFIGURE_ARGS+=	--with-canna --with-wnn=no --with-wnn6=no
-LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
 .else
 CONFIGURE_ARGS+=	--with-canna=no --with-wnn=no --with-wnn6=no
 .endif
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index d647fafcbb2d..a112fbb884ed 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xinvest
 PORTVERSION=	2.6.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance deskutils
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/finance/xinvest/files/patch-Imakefile b/finance/xinvest/files/patch-Imakefile
new file mode 100644
index 000000000000..3b7f57382ae7
--- /dev/null
+++ b/finance/xinvest/files/patch-Imakefile
@@ -0,0 +1,12 @@
+--- Imakefile.orig  2011-04-13 14:00:23.062577466 +0400
++++ Imakefile   2011-04-13 14:00:32.347416233 +0400
+@@ -13,7 +13,7 @@
+ XCOMM  HAVE_LIBDT and XPRINT if CDE or LessTif's libDt is around
+ XCOMM
+ 
+-DEFINES = -DSHAPE
++DEFINES = -DSHAPE -DPRINTING_SUPPORTED
+ INCLUDES = -I$(INCROOT)/X11
+ SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm
+ DEPLIBS = 
+
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index b92e0e9f99c7..a64bcc63f0d4 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/163/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/sge60/files/patch-aimk b/sysutils/sge60/files/patch-aimk
index 83a4c1990e21..cd6e746ed30b 100644
--- a/sysutils/sge60/files/patch-aimk
+++ b/sysutils/sge60/files/patch-aimk
@@ -24,7 +24,7 @@ $FreeBSD$
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
-+   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include"
++   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
     set LIBS     = "$LIBS -lkvm"
diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 3b9d52483680..f96b189a98dd 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/169/:src \
 		http://gridengine.sunsource.net/download/SGE61/:bin \
diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk
index c16574e2e682..236788214e27 100644
--- a/sysutils/sge61/files/patch-aimk
+++ b/sysutils/sge61/files/patch-aimk
@@ -24,7 +24,7 @@ $FreeBSD$
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
-+   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include"
++   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
     set LIBS     = "$LIBS -lkvm"
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 9724461a035f..6253cfb634cc 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/197/:src \
 		${MASTER_SITE_LOCAL:S/$/:src/}
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index 6b37ee31433b..16801a5c093e 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -24,7 +24,7 @@ $FreeBSD$
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
-+   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include -DNeedFunctionPrototypes -DNeedVarargsPrototypes"
++   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -DNeedFunctionPrototypes -DNeedVarargsPrototypes"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
 -   set LIBS     = "$LIBS -lkvm"