View | Details | Raw Unified | Return to bug 19317
Collapse All | Expand All

(-)Makefile (-13 / +12 lines)
Lines 25-36 Link Here
25
# if you want to use the tcl/tk frontend pgaccess, then you need to build
25
# if you want to use the tcl/tk frontend pgaccess, then you need to build
26
# postgresql with tcl support by typing: make WITH_TCL=yes
26
# postgresql with tcl support by typing: make WITH_TCL=yes
27
.if defined(WITH_TCL)
27
.if defined(WITH_TCL)
28
TCL_INCDIR=	${LOCALBASE}/include/tcl8.0
28
TCL_INCDIR=	${LOCALBASE}/include/tcl8.2
29
TK_INCDIR=	${LOCALBASE}/include/tk8.0
29
TK_INCDIR=	${LOCALBASE}/include/tk8.2
30
MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR}
30
MAKE_ENV=	WITH_TCL=true TCL_INCDIR=${TCL_INCDIR}
31
LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80 \
31
LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
32
		tk80.1:${PORTSDIR}/x11-toolkits/tk80
32
		tk82.1:${PORTSDIR}/x11-toolkits/tk82
33
CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"
33
CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
34
.endif
34
.endif
35
35
36
# if you want jdbc, type make WITH_JDBC=yes
36
# if you want jdbc, type make WITH_JDBC=yes
Lines 103-116 Link Here
103
	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \
103
	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \
104
		${WRKSRC}/Makefile.global.in.old \
104
		${WRKSRC}/Makefile.global.in.old \
105
		>> ${WRKSRC}/Makefile.global.in
105
		>> ${WRKSRC}/Makefile.global.in
106
# pgaccess (accidentally?) removed from distribution, so leave it for now
106
.if defined(WITH_TCL)
107
#.if defined(WITH_TCL)
107
	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.sh \
108
#	@ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \
108
		${WRKSRC}/bin/pgaccess/pgaccess.sh.orig
109
#		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig
109
	@ ${SED} -e "s=__wish__=`/usr/bin/which wish8.2`=" \
110
#	@ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \
110
		${WRKSRC}/bin/pgaccess/pgaccess.sh.orig \
111
#		${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \
111
		>> ${WRKSRC}/bin/pgaccess/pgaccess.sh
112
#		>> ${WRKSRC}/bin/pgaccess/pgaccess.tcl
112
.endif
113
#.endif
114
113
115
post-build:
114
post-build:
116
.if defined(WITH_JDBC)
115
.if defined(WITH_JDBC)

Return to bug 19317