sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Activate tcl/tk 8.5

Browse source 
- Fix build onf amd64 [1]

Reported by:	PH (via pav) [1]
Tested by:	pluknet (on EFNet/#bsdports)
This commit is contained in:
Pietro Cerutti 2010-06-14 07:47:11 +00:00
parent 0614d355ab
commit 30c71ad3b2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=256502
2 changed files with 9 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
math/goblin/Makefile
View file

@ -16,28 +16,25 @@ EXTRACT_SUFX= .tgz
MAINTAINER= gahr@FreeBSD.org MAINTAINER= gahr@FreeBSD.org
COMMENT= A Graph Object Library for Network Programming Problems COMMENT= A Graph Object Library for Network Programming Problems
USE_TK= 84 USE_TK= 84+
USE_TCL= 84 USE_TCL= 84+
USE_XORG= x11
USE_GMAKE= yes USE_GMAKE= yes
USE_LDCONFIG= yes USE_LDCONFIG= yes
MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
LD="${CXX}" LIBS="-lm ${LDFLAGS}" LISShared="-lm ${LDFLAGS}" \ LD="${CXX}" LIBS="-lm ${LDFLAGS}" \
libtcl=84 libtk=84 prefix=${PREFIX} libtcl=${USE_TCL} libtk=${USE_TK} prefix=${PREFIX}
ALL_TARGET= all shared ALL_TARGET= all shared
PLIST_SUB+= VERSION=${PORTVERSION:R} PLIST_SUB+= VERSION=${PORTVERSION:R}
CFLAGS+= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/ \ CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/ \
-I${LOCALBASE}/include/tk8.4 ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/tk${TK_VER} ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -ltcl84 -ltk84 ${PTHREAD_LIBS} LDFLAGS= -L${LOCALBASE}/lib -ltcl${USE_TCL} -ltk${USE_TK} ${PTHREAD_LIBS}
WISH= ${LOCALBASE}/bin/wish8.4
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${ARCH} != "i386" .if ${ARCH} == "amd64"
BROKEN= does not build on !i386 CFLAGS+= -fPIC
.endif .endif
post-patch: post-patch:

30
math/goblin/files/patch-Makefile.conf
View file

@ -1,30 +0,0 @@
--- Makefile.conf.orig 2008-05-05 07:51:22.000000000 +0200
+++ Makefile.conf 2008-05-31 02:08:59.000000000 +0200
@@ -27,8 +27,8 @@
libtcl = tcl
libtk = tk
else
- libtcl = tcl8.4
- libtk = tk8.4
+ libtcl = tcl84
+ libtk = tk84
endif
# Qualifier is necessary with Tcl/Tk 8.4 headers:
@@ -44,7 +44,7 @@
ifeq ($(os),solaris)
wish_name = /opt/csw/bin/wish
else
- wish_name = /usr/bin/wish
+ wish_name = %%WISH%%
endif
@@ -52,7 +52,6 @@
## GNU default settings, especially used for linux
-CC = gcc
CCFLAGS = -trigraphs -fPIC
CXX = g++
CXXFLAGS = -g -Wall -pedantic -fPIC