- Fix LIB_DEPENDS

- Fix build when WITHOUT_X11 is defined

PR:		44963
Submitted by:	Ports Fury

5 files changed, 18 insertions, 24 deletions

diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 836c248..a56bc35 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -6,37 +6,39 @@
 
 PORTNAME=	sqsh
 PORTVERSION=	2.1
+PORTREVISION=	1
+PORTCOMMENT=	Interactive tool for querying Sybase database servers
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqsh.org/
 EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	tds.0:${PORTSDIR}/databases/freetds
-
-.ifndef WITHOUT_X11
-WITH_MOTIF=	yes
-CONFIGURE_ARGS+=--with-motif
-USE_XLIB=	yes
-.else
-PKGNAMESUFFIX+=	-nox11
-.endif
+LIB_DEPENDS=	tds.0:${PORTSDIR}/databases/freetds \
+		intl.4:${PORTSDIR}/devel/gettext
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	SYBASE="${LOCALBASE}"
-CONFIGURE_ARGS+=--with-readline
+CONFIGURE_ENV=	SYBASE="${LOCALBASE}"
+CONFIGURE_ARGS=	--with-readline
+ALL_TARGET=	build
 
 MAN1=	sqsh.1
 
-ALL_TARGET=	build
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-nox11
+.else
+USE_MOTIF=	yes
+CONFIGURE_ARGS+=	--with-motif
+.endif
 
 post-patch:
-	${MV} ${WRKSRC}/doc/global.sqshrc ${WRKSRC}/doc/global.sqshrc.in
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/global.sqshrc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${PREFIX}/bin
-	cd ${WRKSRC}/doc && \
-		${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/global.sqshrc ${PREFIX}/etc/sqshrc.default
 
 .include <bsd.port.mk>
diff --git a/databases/sqsh/files/patch-ab b/databases/sqsh/files/patch-configure
index 5fd2c77..4931c34 100644
--- a/databases/sqsh/files/patch-ab
+++ b/databases/sqsh/files/patch-configure
@@ -26,10 +26,3 @@
 +			sunos*|*bsd*)
  				SYBASE_OS="-lm";;
  			solaris*)
-@@ -2691,5 +2690,5 @@
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile scripts/install.sh scripts/make_wrapper.sh"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile scripts/install.sh scripts/make_wrapper.sh doc/global.sqshrc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
diff --git a/databases/sqsh/files/patch-sqshrc b/databases/sqsh/files/patch-doc::global.sqshrc
index e9bd44d..21fe25e 100644
--- a/databases/sqsh/files/patch-sqshrc
+++ b/databases/sqsh/files/patch-doc::global.sqshrc
@@ -6,7 +6,7 @@
 +
 +#	DO NOT EDIT -- the changes will be lost if you reinstall
 +#	or upgrade sqsh port/package. Instead, create your own
-+#		@prefix@/etc/sqshrc
++#		%%LOCALBASE%%/etc/sqshrc
 +#	if you wish to make system-wide customizations.
 +#	User-specific customizations can be made in ~/.sqshrc files.
  
diff --git a/databases/sqsh/files/patch-rcpath b/databases/sqsh/files/patch-src::Makefile.in
index bb082ed..bb082ed 100644
--- a/databases/sqsh/files/patch-rcpath
+++ b/databases/sqsh/files/patch-src::Makefile.in
diff --git a/databases/sqsh/pkg-comment b/databases/sqsh/pkg-comment
deleted file mode 100644
index 2bda6af..0000000
--- a/databases/sqsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Interactive tool for querying Sybase database servers