summaryrefslogtreecommitdiff
path: root/databases/sqsh-x11
diff options
context:
space:
mode:
authorjlam <jlam>2008-04-22 16:23:36 +0000
committerjlam <jlam>2008-04-22 16:23:36 +0000
commitbc44e4c57768fe0b83563ef9ad2f2cd37dff4de8 (patch)
tree852c06b1c2db70ee45a50372e6130606174624e1 /databases/sqsh-x11
parent621bff05e97b53b652c1001c12d10359206a3330 (diff)
downloadpkgsrc-bc44e4c57768fe0b83563ef9ad2f2cd37dff4de8.tar.gz
Restructure the following packages:
databases/sqsh databases/sqsh-motif databases/sqsh-x11 The latter two are now just databases/sqsh built with a specific set of options. Changes include: + Add options.mk that supports three options: sqsh-motif Motif GUI sqsh-xaw Athena GUI sybase-openclient Use real Sybase Note that USE_SYBASE_OPENCLIENT is a legacy variable for the new global "sybase-openclient" option. + Remove Makefile.common and move all logic into sqsh/Makefile and sqsh/options.mk. + Remove section in patch-aa that tried to deal with termcap/curses issues for readline. That is now automatically taken care of in pkgsrc through termcap.buildlink3.mk, which is included here indirectly by readline/buildlink3.mk. + Add full DESTDIR support. + Bump the PKGREVISION for sqsh, sqsh-motif and sqsh-x11 to 5. All three packages now track and use the same PKGREVISION number.
Diffstat (limited to 'databases/sqsh-x11')
-rw-r--r--databases/sqsh-x11/Makefile22
1 files changed, 8 insertions, 14 deletions
diff --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile
index a2c42697fbd..7b636e240c7 100644
--- a/databases/sqsh-x11/Makefile
+++ b/databases/sqsh-x11/Makefile
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2007/01/30 22:38:10 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/22 16:23:37 jlam Exp $
-PKGNAME= sqsh-x11-2.1
-PKGREVISION= 2
-COMMENT= SQL shell for Sybase and MS-SQL servers (X11 support)
+PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
+COMMENT= SQL shell for Sybase and MS-SQL servers (Athena GUI)
-CONFLICTS+= sqsh-[0-9]*
-CONFLICTS+= sqsh-motif-[0-9]*
+FILESDIR= ${.CURDIR}/../../databases/sqsh/files
+PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches
+PKGDIR= ${.CURDIR}/../../databases/sqsh
-CONFIGURE_ARGS+= --with-x
+PKG_OPTIONS.sqsh+= -sqsh-motif sqsh-xaw
-PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches
-DISTINFO_FILE= ${.CURDIR}/../../databases/sqsh/distinfo
-PLIST_SRC= ${.CURDIR}/../../databases/sqsh/PLIST
-DESCR_SRC= ${.CURDIR}/../../databases/sqsh/DESCR
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../databases/sqsh/Makefile.common"
+.include "../../databases/sqsh/Makefile"