* Fix build with upcoming X.Org 6.8.1 [1]

* Temporarily disable CUPS support to fix a crash do to a symbol conflict
  between OpenSSL and NSS [2]

PR:		75045 [2]
Submitted by:	lesi [1]

27 files changed, 135 insertions, 9 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox-devel/files/patch-config::mkdepend::Makefile.in b/www/firefox-devel/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox-devel/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox-esr/files/mozconfig.in
+++ b/www/firefox-esr/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox-esr/files/patch-config::mkdepend::Makefile.in b/www/firefox-esr/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox-esr/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox/files/patch-config::mkdepend::Makefile.in b/www/firefox/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox10/files/patch-config::mkdepend::Makefile.in b/www/firefox10/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox10/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox15/files/mozconfig.in
+++ b/www/firefox15/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox15/files/patch-config::mkdepend::Makefile.in b/www/firefox15/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox15/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox3-devel/files/mozconfig.in
+++ b/www/firefox3-devel/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in b/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox35/files/mozconfig.in b/www/firefox35/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox35/files/mozconfig.in
+++ b/www/firefox35/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox35/files/patch-config::mkdepend::Makefile.in b/www/firefox35/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox35/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/firefox36/files/patch-config::mkdepend::Makefile.in b/www/firefox36/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/firefox36/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/flock/Makefile b/www/flock/Makefile
index e5c044e9e151..aeecbba11251 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -144,6 +144,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index 26bd8e79d771..a2c8dccba3ac 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -22,6 +22,8 @@ export PERL="@PERL@"
 mk_add_options PERL=$PERL
 # Configure options for installation
 ac_add_options --prefix=@FAKEDIR@
+ac_add_options --x-includes=@X11BASE@/include
+ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
diff --git a/www/flock/files/patch-config::mkdepend::Makefile.in b/www/flock/files/patch-config::mkdepend::Makefile.in
new file mode 100644
index 000000000000..bace012a282e
--- /dev/null
+++ b/www/flock/files/patch-config::mkdepend::Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)