- Support LOCALBASE properly

PR:		43709
Submitted by:	Ports Fury

10 files changed, 140 insertions, 20 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 20f20c2cede8..2ab42e3f570a 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -28,12 +29,15 @@ USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE=	${WRKSRC}/autogen.sh
 AUTOCONF=	${TRUE}
-CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
+		--with-extra-inc="${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell
+CONFIGURE_ARGS+=	--with-pspell \
+			--with-pspell-lib="${LOCALBASE}/lib" \
+			--with-pspell-include="${LOCALBASE}/include"
 .endif
 
 .if defined(WITH_ISPELL)
@@ -60,7 +64,7 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-                's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-                 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx-devel/files/patch-config::pspell.m4 b/print/lyx-devel/files/patch-config::pspell.m4
new file mode 100644
index 000000000000..31bfdce0d433
--- /dev/null
+++ b/print/lyx-devel/files/patch-config::pspell.m4
@@ -0,0 +1,20 @@
+--- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
++++ config/pspell.m4	Wed Oct  2 22:10:21 2002
+@@ -12,7 +12,7 @@
+         fi
+       ])
+ 
+-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
++    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
+       pspell_use_include="$withval",
+       pspell_use_include=NONE)
+ 
+@@ -22,7 +22,7 @@
+       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
+     fi
+ 
+-    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
++    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
+       pspell_use_lib="$withval",
+       pspell_use_lib=NONE)
+ 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 20f20c2cede8..2ab42e3f570a 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -28,12 +29,15 @@ USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE=	${WRKSRC}/autogen.sh
 AUTOCONF=	${TRUE}
-CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
+		--with-extra-inc="${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell
+CONFIGURE_ARGS+=	--with-pspell \
+			--with-pspell-lib="${LOCALBASE}/lib" \
+			--with-pspell-include="${LOCALBASE}/include"
 .endif
 
 .if defined(WITH_ISPELL)
@@ -60,7 +64,7 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-                's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-                 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx/files/patch-config::pspell.m4 b/print/lyx/files/patch-config::pspell.m4
new file mode 100644
index 000000000000..31bfdce0d433
--- /dev/null
+++ b/print/lyx/files/patch-config::pspell.m4
@@ -0,0 +1,20 @@
+--- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
++++ config/pspell.m4	Wed Oct  2 22:10:21 2002
+@@ -12,7 +12,7 @@
+         fi
+       ])
+ 
+-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
++    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
+       pspell_use_include="$withval",
+       pspell_use_include=NONE)
+ 
+@@ -22,7 +22,7 @@
+       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
+     fi
+ 
+-    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
++    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
+       pspell_use_lib="$withval",
+       pspell_use_lib=NONE)
+ 
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 20f20c2cede8..2ab42e3f570a 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -28,12 +29,15 @@ USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE=	${WRKSRC}/autogen.sh
 AUTOCONF=	${TRUE}
-CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
+		--with-extra-inc="${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell
+CONFIGURE_ARGS+=	--with-pspell \
+			--with-pspell-lib="${LOCALBASE}/lib" \
+			--with-pspell-include="${LOCALBASE}/include"
 .endif
 
 .if defined(WITH_ISPELL)
@@ -60,7 +64,7 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-                's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-                 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx14/files/patch-config::pspell.m4 b/print/lyx14/files/patch-config::pspell.m4
new file mode 100644
index 000000000000..31bfdce0d433
--- /dev/null
+++ b/print/lyx14/files/patch-config::pspell.m4
@@ -0,0 +1,20 @@
+--- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
++++ config/pspell.m4	Wed Oct  2 22:10:21 2002
+@@ -12,7 +12,7 @@
+         fi
+       ])
+ 
+-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
++    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
+       pspell_use_include="$withval",
+       pspell_use_include=NONE)
+ 
+@@ -22,7 +22,7 @@
+       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
+     fi
+ 
+-    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
++    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
+       pspell_use_lib="$withval",
+       pspell_use_lib=NONE)
+ 
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 20f20c2cede8..2ab42e3f570a 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -28,12 +29,15 @@ USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE=	${WRKSRC}/autogen.sh
 AUTOCONF=	${TRUE}
-CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
+		--with-extra-inc="${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell
+CONFIGURE_ARGS+=	--with-pspell \
+			--with-pspell-lib="${LOCALBASE}/lib" \
+			--with-pspell-include="${LOCALBASE}/include"
 .endif
 
 .if defined(WITH_ISPELL)
@@ -60,7 +64,7 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-                's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-                 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx15/files/patch-config::pspell.m4 b/print/lyx15/files/patch-config::pspell.m4
new file mode 100644
index 000000000000..31bfdce0d433
--- /dev/null
+++ b/print/lyx15/files/patch-config::pspell.m4
@@ -0,0 +1,20 @@
+--- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
++++ config/pspell.m4	Wed Oct  2 22:10:21 2002
+@@ -12,7 +12,7 @@
+         fi
+       ])
+ 
+-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
++    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
+       pspell_use_include="$withval",
+       pspell_use_include=NONE)
+ 
+@@ -22,7 +22,7 @@
+       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
+     fi
+ 
+-    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
++    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
+       pspell_use_lib="$withval",
+       pspell_use_lib=NONE)
+ 
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 20f20c2cede8..2ab42e3f570a 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -28,12 +29,15 @@ USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE=	${WRKSRC}/autogen.sh
 AUTOCONF=	${TRUE}
-CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
+		--with-extra-inc="${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell
+CONFIGURE_ARGS+=	--with-pspell \
+			--with-pspell-lib="${LOCALBASE}/lib" \
+			--with-pspell-include="${LOCALBASE}/include"
 .endif
 
 .if defined(WITH_ISPELL)
@@ -60,7 +64,7 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-                's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-                 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx16/files/patch-config::pspell.m4 b/print/lyx16/files/patch-config::pspell.m4
new file mode 100644
index 000000000000..31bfdce0d433
--- /dev/null
+++ b/print/lyx16/files/patch-config::pspell.m4
@@ -0,0 +1,20 @@
+--- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
++++ config/pspell.m4	Wed Oct  2 22:10:21 2002
+@@ -12,7 +12,7 @@
+         fi
+       ])
+ 
+-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
++    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
+       pspell_use_include="$withval",
+       pspell_use_include=NONE)
+ 
+@@ -22,7 +22,7 @@
+       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
+     fi
+ 
+-    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
++    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
+       pspell_use_lib="$withval",
+       pspell_use_lib=NONE)
+