diff options
| author | mi <mi@FreeBSD.org> | 2004-04-13 02:26:49 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2004-04-13 02:26:49 +0800 |
| commit | b42de0abfd391d938bbb5b4b6ce14ae969b9b32c (patch) | |
| tree | efa8091c458be2ebf376efac4acfe101e4e27e3d /devel/tcl-neo | |
| parent | 3088336812c548665bf6233880e8b22419d19f17 (diff) | |
| download | freebsd-ports-gnome-b42de0abfd391d938bbb5b4b6ce14ae969b9b32c.tar.gz freebsd-ports-gnome-b42de0abfd391d938bbb5b4b6ce14ae969b9b32c.tar.zst freebsd-ports-gnome-b42de0abfd391d938bbb5b4b6ce14ae969b9b32c.zip | |
Make the TCL_VER(sion) a knob, rather than hardcoding the 8.3.
Default to 8.4 (as TclX does now), thus bump PORTREVISION.
Thanks to: kris and the bento cluster
Diffstat (limited to 'devel/tcl-neo')
| -rw-r--r-- | devel/tcl-neo/Makefile | 11 | ||||
| -rw-r--r-- | devel/tcl-neo/files/Makefile.bsd | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile index 4e5b78a15da6..3de161433390 100644 --- a/devel/tcl-neo/Makefile +++ b/devel/tcl-neo/Makefile @@ -7,7 +7,7 @@ PORTNAME= neotcl PORTVERSION= 8.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel tcl83 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nws @@ -28,21 +28,18 @@ WRKSRC= ${WRKDIR}/${SUBDIR}/generic EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${SUBDIR}/generic ${SUBDIR}/neolibs MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= NEO_LIBRARY=${NEO_LIBRARY} +TCL_VER?= 8.4 +MAKE_ENV+= NEO_LIBRARY=${NEO_LIBRARY} TCL_VER=${TCL_VER} DDIR= ${PREFIX}/lib/tcl${TCLV}/Trf post-build: - cd ${WRKSRC}/../neolibs && ${ECHO_CMD} 'auto_mkindex . */*.tcl' | tclsh8.3 + cd ${WRKSRC}/../neolibs && ${ECHO_CMD} 'auto_mkindex . */*.tcl' | tclsh${TCL_VER} NEO_LIBRARY= ${PREFIX}/lib/neo8.2 .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 -BROKEN= "Broken pkg-plist" -.endif - post-install: ${MKDIR} ${NEO_LIBRARY} ${CP} -Rp ${WRKSRC}/../neolibs/[a-z]* ${NEO_LIBRARY} diff --git a/devel/tcl-neo/files/Makefile.bsd b/devel/tcl-neo/files/Makefile.bsd index 4ce127da1d3d..9d92f991de58 100644 --- a/devel/tcl-neo/files/Makefile.bsd +++ b/devel/tcl-neo/files/Makefile.bsd @@ -1,7 +1,9 @@ PREFIX?= /usr/local NEO_LIBRARY?= ${PREFIX}/lib/neo8.2 -CFLAGS+= -I${PREFIX}/include/tcl8.3 -I${PREFIX}/include +TCL_VER?= 8.4 +TCL_DVER= ${TCL_VER:S/.//} +CFLAGS+= -I${PREFIX}/include/tcl${TCL_VER} -I${PREFIX}/include CFLAGS+= -DNEO_LIBRARY=\"${NEO_LIBRARY}\" CFLAGS+= -DHAVE_TERMIOS_H -DHAVE_STDLIB_H -DHAVE_SYS_TIME_H -DHAVE_UNISTD_H CFLAGS+= -DNEO_DB # -DDB_185_COMPAT -- seems broken :-( @@ -16,7 +18,7 @@ SRCS= neoXcrypt.c neoPkgInit.c neoXwww.c neoXgeneral.c \ SHLIB_NAME= libneo82.so.1 -LDADD+= -lcrypt -L${PREFIX}/lib -ltcl83 -lm -lmd -ldb2 # -ldap -llber +LDADD+= -lcrypt -L${PREFIX}/lib -ltcl${TCL_DVER} -lm -lmd -ldb2 # -ldap -llber SHLIBDIR= ${PREFIX}/lib |