pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkgconflict Removed the package as it has not...
details: https://anonhg.NetBSD.org/pkgsrc/rev/808e162251b7
branches: trunk
changeset: 497568:808e162251b7
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Jul 30 20:38:30 2005 +0000
description:
Removed the package as it has not been working since 2001. Ok'ed by
wennmach.
diffstat:
pkgtools/pkgconflict/DESCR | 10 -
pkgtools/pkgconflict/Makefile | 38 ----
pkgtools/pkgconflict/PLIST | 4 -
pkgtools/pkgconflict/files/dewey_cmp.c | 292 --------------------------------
pkgtools/pkgconflict/files/pkgconflict | 155 ----------------
pkgtools/pkgconflict/files/pkgdbextract | 40 ----
6 files changed, 0 insertions(+), 539 deletions(-)
diffs (truncated from 563 to 300 lines):
diff -r 9bec247ca885 -r 808e162251b7 pkgtools/pkgconflict/DESCR
--- a/pkgtools/pkgconflict/DESCR Sat Jul 30 15:45:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-pkgconflict is a script that searches for conflicting packages.
-
-In a first step it gathers the package and file names of all known
-packages. The source for this step is either the contents of
-/var/db/pkg, or a directory where the builk builds saved the
-package databases.
-
-In a second step, it calls a database system, PostgreSQL, to
-determine which packages have common file names. Packages with
-registered CONFLICT lines are filtered out.
diff -r 9bec247ca885 -r 808e162251b7 pkgtools/pkgconflict/Makefile
--- a/pkgtools/pkgconflict/Makefile Sat Jul 30 15:45:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2005/06/17 03:50:29 jlam Exp $
-#
-
-DISTNAME= pkgconflict-0.4
-CATEGORIES= pkgtools
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= wennmach%NetBSD.org@localhost
-COMMENT= Scripts to find conflicting packages in pkgsrc
-
-WRKSRC= ${WRKDIR}
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql/server
-
-INSTALLATION_DIRS= bin lib/postgresql
-
-post-extract:
- @for f in dewey_cmp.c pkgconflict pkgdbextract; do \
- ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/$$f >${WRKSRC}/$$f; \
- done
-
-do-build:
- cd ${WRKSRC} && ${COMPILE.c} -fPIC dewey_cmp.c
- cd ${WRKSRC} && ${LINK.c} -shared -o dewey_cmp.so dewey_cmp.o
-
-do-install:
- ${INSTALL_LIB} ${WRKSRC}/dewey_cmp.so ${PREFIX}/lib/postgresql/
- ${INSTALL_SCRIPT} ${WRKSRC}/pkgconflict ${PREFIX}/bin/
- ${INSTALL_SCRIPT} ${WRKSRC}/pkgdbextract ${PREFIX}/bin/
-
-.include "../../mk/pgsql.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 9bec247ca885 -r 808e162251b7 pkgtools/pkgconflict/PLIST
--- a/pkgtools/pkgconflict/PLIST Sat Jul 30 15:45:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/05 21:15:15 tv Exp $
-lib/postgresql/dewey_cmp.so
-bin/pkgconflict
-bin/pkgdbextract
diff -r 9bec247ca885 -r 808e162251b7 pkgtools/pkgconflict/files/dewey_cmp.c
--- a/pkgtools/pkgconflict/files/dewey_cmp.c Sat Jul 30 15:45:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-/* $NetBSD: dewey_cmp.c,v 1.2 2001/04/10 14:20:16 wennmach Exp $ */
-
-/*
- * Implement the comparision of a package name with a dewey pattern
- * for use with PostgreSQL.
- *
- * Author: Lex Wennmacher,
- * almost entirely based on the dewey routines written by: Hubert Feyrer
- * (taken from: basesrc/usr.sbin/pkg_install/lib/str.c, version 1.28)
- */
-
-#include <sys/cdefs.h>
-#if 0
-static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp";
-#else
-__RCSID("$NetBSD: dewey_cmp.c,v 1.2 2001/04/10 14:20:16 wennmach Exp $");
-#endif
-
-/*
- * FreeBSD install - a package for the installation and maintainance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous string utilities.
- *
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/queue.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <assert.h>
-#include <err.h>
-#include <fnmatch.h>
-
-int pmatch(const char *, const char *);
-
-typedef enum deweyop_t {
- GT,
- GE,
- LT,
- LE
-} deweyop_t;
-
-/*
- * Compare two dewey decimal numbers
- */
-static int
-deweycmp(char *a, deweyop_t op, char *b)
-{
- int ad;
- int bd;
- char *a_nb;
- char *b_nb;
- int in_nb = 0;
- int cmp;
-
- assert(a != NULL);
- assert(b != NULL);
-
- /* Null out 'n' in any "nb" suffixes for initial pass */
- if ((a_nb = strstr(a, "nb")))
- *a_nb = 0;
- if ((b_nb = strstr(b, "nb")))
- *b_nb = 0;
-
- for (;;) {
- if (*a == 0 && *b == 0) {
- if (!in_nb && (a_nb || b_nb)) {
- /*
- * If exact match on first pass, test
- * "nb<X>" suffixes in second pass
- */
- in_nb = 1;
- if (a_nb)
- a = a_nb + 2; /* Skip "nb" suffix */
- if (b_nb)
- b = b_nb + 2; /* Skip "nb" suffix */
- } else {
- cmp = 0;
- break;
- }
- }
-
- ad = bd = 0;
- for (; *a && *a != '.'; a++) {
- ad = (ad * 10) + (*a - '0');
- }
- for (; *b && *b != '.'; b++) {
- bd = (bd * 10) + (*b - '0');
- }
- if ((cmp = ad - bd) != 0) {
- break;
- }
- if (*a == '.')
- ++a;
- if (*b == '.')
- ++b;
- }
- /* Replace any nulled 'n' */
- if (a_nb)
- *a_nb = 'n';
- if (b_nb)
- *b_nb = 'n';
- return (op == GE) ? cmp >= 0 : (op == GT) ? cmp > 0 :
- (op == LE) ? cmp <= 0 : cmp < 0;
-}
-
-/*
- * Perform alternate match on "pkg" against "pattern",
- * calling pmatch (recursively) to resolve any other patterns.
- * Return 1 on match, 0 otherwise
- */
-static int
-alternate_match(const char *pattern, const char *pkg)
-{
- char *sep;
- char buf[FILENAME_MAX];
- char *last;
- char *alt;
- char *cp;
- int cnt;
- int found;
-
- if ((sep = strchr(pattern, '{')) == (char *) NULL) {
- errx(1, "alternate_match(): '{' expected in `%s'", pattern);
- }
- (void)strncpy(buf, pattern, (size_t) (sep - pattern));
- alt = &buf[sep - pattern];
- last = (char *) NULL;
- for (cnt = 0, cp = sep; *cp && last == (char *) NULL; cp++) {
- if (*cp == '{') {
- cnt++;
- } else if (*cp == '}' && --cnt == 0 && last == (char *) NULL) {
- last = cp + 1;
- }
- }
- if (cnt != 0) {
- errx(1, "Malformed alternate `%s'", pattern);
- }
- for (found = 0, cp = sep + 1; *sep != '}'; cp = sep + 1) {
- for (cnt = 0, sep = cp; cnt > 0 || (cnt == 0 && *sep != '}' &&
- *sep != ','); sep++) {
- if (*sep == '{') {
- cnt++;
- } else if (*sep == '}') {
- cnt--;
- }
- }
- (void)snprintf(alt, sizeof(buf) - (alt - buf), "%.*s%s",
- (int)(sep - cp), cp, last);
- if (pmatch(buf, pkg) == 1) {
- found = 1;
- }
- }
- return found;
-}
-
-/*
- * Perform dewey match on "pkg" against "pattern".
- * Return 1 on match, 0 otherwise
- */
-static int
-dewey_match(const char *pattern, const char *pkg)
-{
- deweyop_t op;
- char *cp;
- char *sep;
- char *ver;
- char name[FILENAME_MAX];
- int n;
-
- if ((sep = strpbrk(pattern, "<>")) == NULL) {
- errx(1, "dewey_match(): '<' or '>' expected in `%s'", pattern);
- }
- (void)snprintf(name, sizeof(name), "%.*s", (int)(sep - pattern),
- pattern);
- op = (*sep == '>') ? (*(sep + 1) == '=') ? GE : GT : (*(sep + 1) == '=')
- ? LE : LT;
- ver = (op == GE || op == LE) ? sep + 2 : sep + 1;
- n = (int) (sep - pattern);
- if ((cp = strrchr(pkg, '-')) != (char *) NULL) {
- if (strncmp(pkg, name, (size_t)(cp - pkg)) == 0 &&
- n == cp - pkg) {
- if (deweycmp(cp + 1, op, ver)) {
- return 1;
- }
- }
- }
- return 0;
-}
-
-/*
- * Perform glob match on "pkg" against "pattern".
- * Return 1 on match, 0 otherwise
- */
-static int
-glob_match(const char *pattern, const char *pkg)
-{
- return fnmatch(pattern, pkg, FNM_PERIOD) == 0;
-}
-
-/*
- * Perform simple match on "pkg" against "pattern".
- * Return 1 on match, 0 otherwise
- */
-static int
-simple_match(const char *pattern, const char *pkg)
-{
- return strcmp(pattern, pkg) == 0;
-}
-
Home |
Main Index |
Thread Index |
Old Index