diff options
| author | mi <mi@FreeBSD.org> | 2003-10-28 05:03:04 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2003-10-28 05:03:04 +0800 |
| commit | 0d4b9809d94341a6a86763b74c37a2fd2da15dd6 (patch) | |
| tree | a33af8175a473379ad4e92de13b01d4ad2b6aa0e | |
| parent | fb83bcb0cae025ad2be2e28f33ec0c8f0c3ee6f2 (diff) | |
| download | freebsd-ports-gnome-0d4b9809d94341a6a86763b74c37a2fd2da15dd6.tar.gz freebsd-ports-gnome-0d4b9809d94341a6a86763b74c37a2fd2da15dd6.tar.zst freebsd-ports-gnome-0d4b9809d94341a6a86763b74c37a2fd2da15dd6.zip | |
Another case of SHLIBDIR->LIBDIR. While here, upgrade from 2.2a2 to 2.2a4
(released in August 2002). Stop parametrizing some of the values in
files/Makefile.bsd -- they change _so rarely_ the benefit does not justify
the gymnastics. Default to TCL-8.3
Suggested by: kris
| -rw-r--r-- | devel/tcl-memchan/Makefile | 8 | ||||
| -rw-r--r-- | devel/tcl-memchan/distinfo | 2 | ||||
| -rw-r--r-- | devel/tcl-memchan/files/Makefile.bsd | 25 |
3 files changed, 17 insertions, 18 deletions
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile index adc10d16f0c7..00dfe4ecbdf6 100644 --- a/devel/tcl-memchan/Makefile +++ b/devel/tcl-memchan/Makefile @@ -6,11 +6,11 @@ # PORTNAME= memchan -PORTVERSION= 2.2a2 -CATEGORIES= devel tcl83 +PORTVERSION= 2.2a4 +CATEGORIES= devel tcl${TCL_VER:S/.//} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} PKGNAMEPREFIX= tcl- -DISTNAME= memchan${PORTVERSION} +DISTNAME= Memchan${PORTVERSION} MASTER_SITE_SUBDIR=${PORTNAME} MAINTAINER= mi@aldan.algebra.com @@ -23,7 +23,7 @@ USE_BZIP2= yes MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ARGS+= -j2 -TCL_VER?= 8.3 +TCL_VER?= 8.4 DDIR= ${PREFIX}/lib/tcl${TCL_VER}/Trf MAKE_ENV+= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \ diff --git a/devel/tcl-memchan/distinfo b/devel/tcl-memchan/distinfo index 511479ad97b6..2c6cfbfbe313 100644 --- a/devel/tcl-memchan/distinfo +++ b/devel/tcl-memchan/distinfo @@ -1 +1 @@ -MD5 (memchan2.2a2.tar.bz2) = 8bcee09f9b875bfba9f8ed953524766d +MD5 (Memchan2.2a4.tar.bz2) = 4016a2bbac5ef43b430416dad9e5be2a diff --git a/devel/tcl-memchan/files/Makefile.bsd b/devel/tcl-memchan/files/Makefile.bsd index c2f7338e2edf..98c11963cfc8 100644 --- a/devel/tcl-memchan/files/Makefile.bsd +++ b/devel/tcl-memchan/files/Makefile.bsd @@ -3,10 +3,9 @@ SHLIB_NAME= lib${LIBNAME}.so.2 .PATH: ${.CURDIR}/generic -.if exists(${.CURDIR}/Makefile.in) -_SRCS!= ${MAKE} -f ${.CURDIR}/Makefile.in -V Memchan_SOURCES -SRCS= ${_SRCS:S/@srcdir@\/generic\///} -.endif +SRCS= memchan.c init.c counter.c fifo.c fifo2.c null.c buf.c \ + bufFix.c bufExt.c bufRange.c bufQueue.c bufStubInit.c \ + bufStubLib.c TCL_VER?= 8.3 LOCALBASE?= /usr/local @@ -19,27 +18,27 @@ LDADD= -L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//} all: pkgIndex.tcl test pkgIndex.tcl: - echo 'package ifneeded ${LIBNAME} ${SHLIB_MAJOR}.${SHLIB_MINOR} \ + echo 'package ifneeded ${LIBNAME} 2.2 \ [list load [file join $$dir $(SHLIB_NAME)]]' > pkgIndex.tcl -DIR = lib/tcl${TCL_VER}/${LIBNAME} -SHLIBDIR = ${PREFIX}/${DIR} -MANDIR = ${PREFIX}/man/man +DIR = lib/tcl${TCL_VER}/${LIBNAME} +LIBDIR = ${PREFIX}/${DIR} +MANDIR = ${PREFIX}/man/man -${SHLIBDIR}: - ${MKDIR} ${SHLIBDIR} +${LIBDIR}: + ${MKDIR} ${LIBDIR} env: @${ECHO} SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} DIR=${DIR} -beforeinstall: ${SHLIBDIR} pkgIndex.tcl - ${INSTALL_DATA} pkgIndex.tcl ${SHLIBDIR}/pkgIndex.tcl +beforeinstall: ${LIBDIR} pkgIndex.tcl + ${INSTALL_DATA} pkgIndex.tcl ${LIBDIR}/pkgIndex.tcl .include <bsd.lib.mk> test: ${SHLIB_NAME} pkgIndex.tcl echo ' set auto_path ${.OBJDIR}; cd ${.CURDIR}/tests; \ - package require ${LIBNAME} ${SHLIB_MAJOR}.${SHLIB_MINOR}; \ + package require ${LIBNAME}; \ if {[catch {source all} msg]} { \ puts stderr $msg; exit -1 \ }' | ${LOCALBASE}/bin/tclsh${TCL_VER} |