From 11e9fca49ab72e04b8a35eafe455245df33cb87a Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sun, 28 Sep 2003 00:08:05 +0000 Subject: Use PCRE from ports --- news/tin/Makefile | 9 ++-- news/tin/files/pcre.h | 113 -------------------------------------------------- 2 files changed, 4 insertions(+), 118 deletions(-) delete mode 100644 news/tin/files/pcre.h (limited to 'news') diff --git a/news/tin/Makefile b/news/tin/Makefile index bf224d5f8c4c..b0839229c546 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -7,7 +7,7 @@ PORTNAME= tin PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= news ipv6 MASTER_SITES= http://mirrors.rcn.net/pub/news/tin/v1.6/ \ ftp://mirrors.rcn.net/pub/news/tin/v1.6/ \ @@ -19,7 +19,8 @@ COMMENT= Easy-to-use threaded newsreader with NOV/NNTP support LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib \ iconv.3:${PORTSDIR}/converters/libiconv \ - intl.5:${PORTSDIR}/devel/gettext + intl.5:${PORTSDIR}/devel/gettext \ + pcre.0:${PORTSDIR}/devel/pcre USE_BZIP2= yes USE_GMAKE= yes @@ -33,6 +34,7 @@ CONFIGURE_ARGS= --with-nntp-default-server=news \ --with-defaults-dir=${PREFIX}/etc \ --with-editor=/usr/bin/ee \ --enable-nls \ + --with-pcre=yes \ --with-screen=ncurses \ --enable-break-long-lines \ --with-libiconv-prefix=${LOCALBASE} \ @@ -99,9 +101,6 @@ post-patch: ${PATCH} ${PATCH_ARGS} ${WRKSRC}/src/Makefile.in -i ${FILESDIR}/canlock.patch .endif -pre-configure: - ${CP} ${FILESDIR}/pcre.h ${WRKSRC}/pcre - pre-build: .if defined(WITH_TIN_CANLOCK) cd ${WRKSRC}/src; ${GMAKE} canlock diff --git a/news/tin/files/pcre.h b/news/tin/files/pcre.h deleted file mode 100644 index d6c239394c61..000000000000 --- a/news/tin/files/pcre.h +++ /dev/null @@ -1,113 +0,0 @@ -/************************************************* -* Perl-Compatible Regular Expressions * -*************************************************/ - -/* Copyright (c) 1997-2001 University of Cambridge */ - -#ifndef _PCRE_H -#define _PCRE_H - -/* The file pcre.h is build by "configure". Do not edit it; instead -make changes to pcre.in. */ - -#define PCRE_MAJOR 3 -#define PCRE_MINOR 9 -#define PCRE_DATE 02-Jan-2002 - -/* Win32 uses DLL by default */ - -#ifdef _WIN32 -# ifdef STATIC -# define PCRE_DL_IMPORT -# else -# define PCRE_DL_IMPORT __declspec(dllimport) -# endif -#else -# define PCRE_DL_IMPORT -#endif - -/* Have to include stdlib.h in order to ensure that size_t is defined; -it is needed here for malloc. */ - -#include - -/* Allow for C++ users */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Options */ - -#define PCRE_CASELESS 0x0001 -#define PCRE_MULTILINE 0x0002 -#define PCRE_DOTALL 0x0004 -#define PCRE_EXTENDED 0x0008 -#define PCRE_ANCHORED 0x0010 -#define PCRE_DOLLAR_ENDONLY 0x0020 -#define PCRE_EXTRA 0x0040 -#define PCRE_NOTBOL 0x0080 -#define PCRE_NOTEOL 0x0100 -#define PCRE_UNGREEDY 0x0200 -#define PCRE_NOTEMPTY 0x0400 -#define PCRE_UTF8 0x0800 - -/* Exec-time and get-time error codes */ - -#define PCRE_ERROR_NOMATCH (-1) -#define PCRE_ERROR_NULL (-2) -#define PCRE_ERROR_BADOPTION (-3) -#define PCRE_ERROR_BADMAGIC (-4) -#define PCRE_ERROR_UNKNOWN_NODE (-5) -#define PCRE_ERROR_NOMEMORY (-6) -#define PCRE_ERROR_NOSUBSTRING (-7) - -/* Request types for pcre_fullinfo() */ - -#define PCRE_INFO_OPTIONS 0 -#define PCRE_INFO_SIZE 1 -#define PCRE_INFO_CAPTURECOUNT 2 -#define PCRE_INFO_BACKREFMAX 3 -#define PCRE_INFO_FIRSTCHAR 4 -#define PCRE_INFO_FIRSTTABLE 5 -#define PCRE_INFO_LASTLITERAL 6 - -/* Types */ - -struct real_pcre; /* declaration; the definition is private */ -struct real_pcre_extra; /* declaration; the definition is private */ - -typedef struct real_pcre pcre; -typedef struct real_pcre_extra pcre_extra; - -/* Store get and free functions. These can be set to alternative malloc/free -functions if required. Some magic is required for Win32 DLL; it is null on -other OS. */ - -PCRE_DL_IMPORT extern void *(*pcre_malloc)(size_t); -PCRE_DL_IMPORT extern void (*pcre_free)(void *); - -#undef PCRE_DL_IMPORT - -/* Functions */ - -extern pcre *pcre_compile(const char *, int, const char **, int *, - const unsigned char *); -extern int pcre_copy_substring(const char *, int *, int, int, char *, int); -extern int pcre_exec(const pcre *, const pcre_extra *, const char *, - int, int, int, int *, int); -extern void pcre_free_substring(const char *); -extern void pcre_free_substring_list(const char **); -extern int pcre_get_substring(const char *, int *, int, int, const char **); -extern int pcre_get_substring_list(const char *, int *, int, const char ***); -extern int pcre_info(const pcre *, int *, int *); -extern int pcre_fullinfo(const pcre *, const pcre_extra *, int, void *); -extern const unsigned char *pcre_maketables(void); -extern pcre_extra *pcre_study(const pcre *, int, const char **); -extern const char *pcre_version(void); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* End of pcre.h */ -- cgit v1.2.3