Sat Jan 19 20:27:30 2013 UTC ()
Add missing buildlink3s for sqsh X11 options.


(riastradh)
diff -r1.32 -r1.33 pkgsrc/databases/sqsh/Makefile
diff -r1.2 -r1.3 pkgsrc/databases/sqsh/options.mk
cvs diff -r1.32 -r1.33 pkgsrc/databases/sqsh/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/sqsh/Makefile 2012/10/02 21:25:54 1.32
+++ pkgsrc/databases/sqsh/Makefile 2013/01/19 20:27:30 1.33
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.32 2012/10/02 21:25:54 asau Exp $ 1# $NetBSD: Makefile,v 1.33 2013/01/19 20:27:30 riastradh Exp $
2 2
3# This section contains variables that might be overridden. 3# This section contains variables that might be overridden.
4PKGNAME?= ${PKGNAME_BASE} 4PKGNAME?= ${PKGNAME_BASE}
5COMMENT?= SQL shell for Sybase and MS-SQL servers 5COMMENT?= SQL shell for Sybase and MS-SQL servers
6 6
7# Normal package Makefile contents follow. 7# Normal package Makefile contents follow.
8DISTNAME= sqsh-2.1-src 8DISTNAME= sqsh-2.1-src
9PKGNAME_BASE= ${DISTNAME:S/-src//} 9PKGNAME_BASE= ${DISTNAME:S/-src//}
10PKGREVISION= 8 10PKGREVISION= 9
11CATEGORIES= databases 11CATEGORIES= databases
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqsh/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqsh/}
13 13
14CONFLICTS+= sqsh-[0-9]* 14CONFLICTS+= sqsh-[0-9]*
15CONFLICTS+= sqsh-motif-[0-9]* 15CONFLICTS+= sqsh-motif-[0-9]*
16CONFLICTS+= sqsh-x11-[0-9]* 16CONFLICTS+= sqsh-x11-[0-9]*
17 17
18MAINTAINER= pkgsrc-users@NetBSD.org 18MAINTAINER= pkgsrc-users@NetBSD.org
19HOMEPAGE= http://www.sqsh.org/ 19HOMEPAGE= http://www.sqsh.org/
20 20
21.include "options.mk" 21.include "options.mk"
22 22
23WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 23WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
cvs diff -r1.2 -r1.3 pkgsrc/databases/sqsh/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/sqsh/options.mk 2009/12/07 23:53:09 1.2
+++ pkgsrc/databases/sqsh/options.mk 2013/01/19 20:27:30 1.3
@@ -1,40 +1,50 @@ @@ -1,40 +1,50 @@
1# $NetBSD: options.mk,v 1.2 2009/12/07 23:53:09 tez Exp $ 1# $NetBSD: options.mk,v 1.3 2013/01/19 20:27:30 riastradh Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.sqsh 3PKG_OPTIONS_VAR= PKG_OPTIONS.sqsh
4PKG_SUPPORTED_OPTIONS+= sybase-openclient 4PKG_SUPPORTED_OPTIONS+= sybase-openclient
5PKG_OPTIONS_OPTIONAL_GROUPS+= x11 5PKG_OPTIONS_OPTIONAL_GROUPS+= x11
6PKG_OPTIONS_GROUP.x11+= sqsh-motif sqsh-xaw 6PKG_OPTIONS_GROUP.x11+= sqsh-motif sqsh-xaw
7PKG_OPTIONS_LEGACY_VARS+= USE_SYBASE_OPENCLIENT:sybase-openclient 7PKG_OPTIONS_LEGACY_VARS+= USE_SYBASE_OPENCLIENT:sybase-openclient
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Motif GUI support. 12### Motif GUI support.
13### 13###
14.if !empty(PKG_OPTIONS:Msqsh-motif) 14.if !empty(PKG_OPTIONS:Msqsh-motif)
15. include "../../mk/motif.buildlink3.mk" 15. include "../../mk/motif.buildlink3.mk"
16CONFIGURE_ARGS+= --with-motif=${MOTIFBASE:Q} 16CONFIGURE_ARGS+= --with-motif=${MOTIFBASE:Q}
17.endif 17.endif
18 18
19### 19###
20### Athena GUI support. 20### Athena GUI support.
21### 21###
22.if !empty(PKG_OPTIONS:Msqsh-xaw) 22.if !empty(PKG_OPTIONS:Msqsh-xaw)
23. include "../../mk/xaw.buildlink3.mk" 23. include "../../mk/xaw.buildlink3.mk"
24CONFIGURE_ARGS+= --with-x 24CONFIGURE_ARGS+= --with-x
25.endif 25.endif
26 26
27### 27###
 28### Common dependencies for X GUI support.
 29###
 30.if !empty(PKG_OPTIONS:Msqsh-motif) || !empty(PKG_OPTIONS:Msqsh-xaw)
 31. include "../../x11/libX11/buildlink3.mk"
 32. include "../../x11/libXext/buildlink3.mk"
 33. include "../../x11/libXmu/buildlink3.mk"
 34. include "../../x11/libXt/buildlink3.mk"
 35.endif
 36
 37###
28### Support for the native Sybase Open Client. 38### Support for the native Sybase Open Client.
29### 39###
30.if !empty(PKG_OPTIONS:Msybase-openclient) 40.if !empty(PKG_OPTIONS:Msybase-openclient)
31BUILD_DEFS+= SYBASE 41BUILD_DEFS+= SYBASE
32. if defined(SYBASE) && exists(${SYBASE}/lib/libct.so) 42. if defined(SYBASE) && exists(${SYBASE}/lib/libct.so)
33BUILDLINK_PASSTHRU_DIRS+= ${SYBASE} 43BUILDLINK_PASSTHRU_DIRS+= ${SYBASE}
34LDFLAGS+= ${COMPILER_RPATH_FLAG}${SYBASE:Q}/lib 44LDFLAGS+= ${COMPILER_RPATH_FLAG}${SYBASE:Q}/lib
35LIBS.SunOS+= -lsocket 45LIBS.SunOS+= -lsocket
36CONFIGURE_ARGS+= --with-static 46CONFIGURE_ARGS+= --with-static
37CONFIGURE_ENV+= SYBASE=${SYBASE:Q} 47CONFIGURE_ENV+= SYBASE=${SYBASE:Q}
38. else 48. else
39PKG_FAIL_REASON+= "You must define SYBASE to the base directory of Open Client." 49PKG_FAIL_REASON+= "You must define SYBASE to the base directory of Open Client."
40. endif 50. endif