Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Nov 2002 15:10:50 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/44963: Update port: databases/sqsh
Message-ID:  <200211052310.gA5NAo1W061558@www.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         44963
>Category:       ports
>Synopsis:       Update port: databases/sqsh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 05 15:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.7-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix LIB_DEPENDS
- Fix build when WITHOUT_X11 is defined

New file:
files/patch-configure
files/patch-doc::global.sqshrc
files/patch-src::Makefile.in

Remove file:
files/patch-ab
files/patch-rcpath
files/patch-sqshrc

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/databases/sqsh/Makefile databases/sqsh/Makefile
--- /usr/ports/databases/sqsh/Makefile	Mon Oct 21 19:01:19 2002
+++ databases/sqsh/Makefile	Mon Nov  4 21:38:54 2002
@@ -6,37 +6,38 @@
 
 PORTNAME=	sqsh
 PORTVERSION=	2.1
+PORTREVISION=	1
 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 -urN /usr/ports/databases/sqsh/files/patch-ab databases/sqsh/files/patch-ab
--- /usr/ports/databases/sqsh/files/patch-ab	Wed Oct 16 04:05:15 2002
+++ databases/sqsh/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,35 +0,0 @@
---- configure	Fri Nov  9 14:58:04 2001
-+++ configure	Tue Oct 15 13:51:29 2002
-@@ -1106,4 +1106,8 @@
- 		SYBASE_LIBS=
- 
-+		if test "$SYBASE_VERSION" = "FreeTDS"
-+		then
-+			SYBASE_LIBS="-lct -ltds"
-+		else
- 		#
- 		# Check for -lblk
-@@ -1152,9 +1156,4 @@
- 		fi
- 
--		#
--		# Check for -ltds (FreeTDS project)
--		#
--		if test -f $SYBASE_LIBDIR/libtds.a; then
--			SYBASE_LIBS="$SYBASE_LIBS -ltds"
- 		fi
- 
-@@ -1196,5 +1195,5 @@
- 			ncr*)
- 				SYBASE_OS="-ldl -lm";;
--			sunos*)
-+			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 -urN /usr/ports/databases/sqsh/files/patch-configure databases/sqsh/files/patch-configure
--- /usr/ports/databases/sqsh/files/patch-configure	Thu Jan  1 09:00:00 1970
+++ databases/sqsh/files/patch-configure	Mon Nov  4 21:23:31 2002
@@ -0,0 +1,28 @@
+--- configure	Fri Nov  9 14:58:04 2001
++++ configure	Tue Oct 15 13:51:29 2002
+@@ -1106,4 +1106,8 @@
+ 		SYBASE_LIBS=
+ 
++		if test "$SYBASE_VERSION" = "FreeTDS"
++		then
++			SYBASE_LIBS="-lct -ltds"
++		else
+ 		#
+ 		# Check for -lblk
+@@ -1152,9 +1156,4 @@
+ 		fi
+ 
+-		#
+-		# Check for -ltds (FreeTDS project)
+-		#
+-		if test -f $SYBASE_LIBDIR/libtds.a; then
+-			SYBASE_LIBS="$SYBASE_LIBS -ltds"
+ 		fi
+ 
+@@ -1196,5 +1195,5 @@
+ 			ncr*)
+ 				SYBASE_OS="-ldl -lm";;
+-			sunos*)
++			sunos*|*bsd*)
+ 				SYBASE_OS="-lm";;
+ 			solaris*)
diff -urN /usr/ports/databases/sqsh/files/patch-doc::global.sqshrc databases/sqsh/files/patch-doc::global.sqshrc
--- /usr/ports/databases/sqsh/files/patch-doc::global.sqshrc	Thu Jan  1 09:00:00 1970
+++ databases/sqsh/files/patch-doc::global.sqshrc	Mon Nov  4 21:26:30 2002
@@ -0,0 +1,12 @@
+--- doc/global.sqshrc	Tue Oct 23 22:31:06 2001
++++ doc/global.sqshrc	Tue Oct 15 13:06:20 2002
+@@ -5,3 +5,8 @@
+ #          resource file for all users of sqsh.
+-#
++
++#	DO NOT EDIT -- the changes will be lost if you reinstall
++#	or upgrade sqsh port/package. Instead, create your own
++#		%%LOCALBASE%%/etc/sqshrc
++#	if you wish to make system-wide customizations.
++#	User-specific customizations can be made in ~/.sqshrc files.
+ 
diff -urN /usr/ports/databases/sqsh/files/patch-rcpath databases/sqsh/files/patch-rcpath
--- /usr/ports/databases/sqsh/files/patch-rcpath	Tue Oct 15 22:18:00 2002
+++ databases/sqsh/files/patch-rcpath	Thu Jan  1 09:00:00 1970
@@ -1,7 +0,0 @@
---- src/Makefile.in	Tue Oct 15 12:59:14 2002
-+++ src/Makefile.in	Tue Oct 15 13:13:13 2002
-@@ -11,3 +11,3 @@
- SQSHRC_GLOBAL = @prefix@/etc/sqshrc
--SQSHRC_PATH   = "$(SQSHRC_GLOBAL):$${HOME}/.sqshrc"
-+SQSHRC_PATH   = "$(SQSHRC_GLOBAL).default:$(SQSHRC_GLOBAL):$${HOME}/.sqshrc"
- 
diff -urN /usr/ports/databases/sqsh/files/patch-sqshrc databases/sqsh/files/patch-sqshrc
--- /usr/ports/databases/sqsh/files/patch-sqshrc	Tue Oct 15 22:18:00 2002
+++ databases/sqsh/files/patch-sqshrc	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
---- doc/global.sqshrc	Tue Oct 23 22:31:06 2001
-+++ doc/global.sqshrc	Tue Oct 15 13:06:20 2002
-@@ -5,3 +5,8 @@
- #          resource file for all users of sqsh.
--#
-+
-+#	DO NOT EDIT -- the changes will be lost if you reinstall
-+#	or upgrade sqsh port/package. Instead, create your own
-+#		@prefix@/etc/sqshrc
-+#	if you wish to make system-wide customizations.
-+#	User-specific customizations can be made in ~/.sqshrc files.
- 
diff -urN /usr/ports/databases/sqsh/files/patch-src::Makefile.in databases/sqsh/files/patch-src::Makefile.in
--- /usr/ports/databases/sqsh/files/patch-src::Makefile.in	Thu Jan  1 09:00:00 1970
+++ databases/sqsh/files/patch-src::Makefile.in	Sat Nov  2 20:57:23 2002
@@ -0,0 +1,7 @@
+--- src/Makefile.in	Tue Oct 15 12:59:14 2002
++++ src/Makefile.in	Tue Oct 15 13:13:13 2002
+@@ -11,3 +11,3 @@
+ SQSHRC_GLOBAL = @prefix@/etc/sqshrc
+-SQSHRC_PATH   = "$(SQSHRC_GLOBAL):$${HOME}/.sqshrc"
++SQSHRC_PATH   = "$(SQSHRC_GLOBAL).default:$(SQSHRC_GLOBAL):$${HOME}/.sqshrc"
+ 

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211052310.gA5NAo1W061558>