mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-28 05:29:48 +00:00
The latest change (adding DEPENDS) made expect build and install
tcl/tk even if they are properly found by LIB_DEPENDS. Make it only extract in that case. While I'm here, make expect and expectk link with shared tcl/tk libs. expectk used to be a 1/2 MB binary! (now it's 136KB) I'd also rather change `-g' to whatever CFLAGS defined in /etc/make.conf, but the author of expect has an explicit comment in the Makefile about him not trusting compilers' optimization. Well, if you say so.
This commit is contained in:
parent
394c2c8970
commit
05a7b89832
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=2687
@ -3,7 +3,7 @@
|
||||
# Date created: 20 November 1994
|
||||
# Whom: pst
|
||||
#
|
||||
# $Id: Makefile,v 1.8 1995/12/07 22:18:09 markm Exp $
|
||||
# $Id: Makefile,v 1.9 1996/02/07 05:10:25 jkh Exp $
|
||||
#
|
||||
|
||||
DISTNAME= expect-5.19
|
||||
@ -11,7 +11,6 @@ CATEGORIES+= lang
|
||||
MASTER_SITES= ftp://ftp.cme.nist.gov/pub/expect/
|
||||
DISTFILES= expect.tar.gz
|
||||
|
||||
DEPENDS= ${PORTSDIR}/lang/tcl ${PORTSDIR}/x11/tk
|
||||
LIB_DEPENDS= tcl\\.7\\.:${PORTSDIR}/lang/tcl \
|
||||
tk\\.3\\.:${PORTSDIR}/x11/tk
|
||||
|
||||
@ -21,4 +20,13 @@ test:
|
||||
HAS_CONFIGURE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
post-extract:
|
||||
(cd ${PORTSDIR}/lang/tcl && make extract)
|
||||
ln -s ${PORTSDIR}/lang/tcl/work/tcl* ${WRKDIR}
|
||||
(cd ${PORTSDIR}/x11/tk && make extract)
|
||||
ln -s ${PORTSDIR}/x11/tk/work/tk* ${WRKDIR}
|
||||
|
||||
pre-install:
|
||||
test -d ${PREFIX}/lib/expect || mkdir -p ${PREFIX}/lib/expect
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,46 +1,3 @@
|
||||
diff -cdNr expect-5.18.ORG/Makefile.in expect-5.18/Makefile.in
|
||||
*** expect-5.18.ORG/Makefile.in Tue Nov 21 23:15:13 1995
|
||||
--- Makefile.in Thu Dec 7 23:33:58 1995
|
||||
***************
|
||||
*** 174,181 ****
|
||||
--- 174,183 ----
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
#INSTALL_PROGRAM = $(INSTALL)
|
||||
+ #INSTALL_SCRIPT = $(INSTALL)
|
||||
#INSTALL_DATA = $(INSTALL)
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
AR = ar
|
||||
***************
|
||||
*** 190,195 ****
|
||||
--- 192,198 ----
|
||||
"HDEFS=$(HDEFS)" \
|
||||
"INSTALL=$(INSTALL)" \
|
||||
"INSTALL_DATA=$(INSTALL_DATA)" \
|
||||
+ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
||||
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||
"LDFLAGS=$(LDFLAGS)" \
|
||||
"RUNTEST=$(RUNTEST)" \
|
||||
***************
|
||||
*** 377,383 ****
|
||||
${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
|
||||
-for i in $(SCRIPT_LIST) ; do \
|
||||
if [ -f $$i ] ; then \
|
||||
! $(INSTALL_PROGRAM) $$i $(bindir_arch_indep)/$$i ; \
|
||||
rm -f $$i ; \
|
||||
else true; fi ; \
|
||||
done
|
||||
--- 380,386 ----
|
||||
${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
|
||||
-for i in $(SCRIPT_LIST) ; do \
|
||||
if [ -f $$i ] ; then \
|
||||
! $(INSTALL_SCRIPT) $$i $(bindir_arch_indep)/$$i ; \
|
||||
rm -f $$i ; \
|
||||
else true; fi ; \
|
||||
done
|
||||
diff -cdNr expect-5.18.ORG/configure expect-5.18/configure
|
||||
*** expect-5.18.ORG/configure Tue Nov 21 23:38:23 1995
|
||||
--- configure Thu Dec 7 23:35:09 1995
|
||||
|
Loading…
Reference in New Issue
Block a user