1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

- Fix build with X.org 7 [1]

- Change MASTER_SITES [1]
- Fix maintainer's e-mail [1]
- Fix build with gcc4 [2]
- Fix wrongly implemented NOPORTDOCS
- Bump PORTREVISION

PR:		ports/106913 [1],
		ports/106914 [2]
Submitted by:	Takeshi Taguchi <taguchi@iij.ad.jp> (maintainer) [1] [2]
Approved by:	erwin (mentor)
This commit is contained in:
Gabor Kovesdan 2007-01-07 11:59:03 +00:00
parent 6d7e79cec2
commit 3b4a391d9f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=181684
3 changed files with 34 additions and 13 deletions

View File

@ -7,15 +7,16 @@
PORTNAME= tk
PORTVERSION= 8.0.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= japanese x11-toolkits tk80
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
PATCH_SITES= ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
PATCHFILES= ${PORTNAME}${PORTVERSION}jp1.7.patch.gz
MAINTAINER= taguchi@tohoku.iij.ad.jp
MAINTAINER= taguchi@iij.ad.jp
COMMENT= Graphical toolkit for Japanized TCL, version 8.0
LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80
@ -23,6 +24,9 @@ LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80
VERSION= ${PORTVERSION:R}
TOPDIR= ${WRKDIR}/${DISTNAME}
WRKSRC= ${TOPDIR}/unix
DOCSDIR= ${PREFIX}/share/doc/tk${VERSION}jp
PORTDOCS= README changes README.FreeBSD.JP README.JP changes.JP \
Incompat80jp
.if defined(PATCH_DEBUG)
PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
.else
@ -31,9 +35,10 @@ PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
USE_AUTOTOOLS= autoconf:213
USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
--enable-xlibHack --enable-onTheSpot
--enable-xlibHack --enable-onTheSpot \
--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
RANLIB= ranlib
INSTALLS_SHLIB= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
@ -49,11 +54,11 @@ post-patch:
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/tk${VERSION}jp
@${MKDIR} ${DOCSDIR}
@(cd ${TOPDIR}; \
${INSTALL_DATA} README changes README.FreeBSD.JP \
README.JP changes.JP \
Incompat80jp ${PREFIX}/share/doc/tk${VERSION}jp; \
Incompat80jp ${DOCSDIR}; \
)
.endif
.if ${PORTOBJFORMAT} == "aout"

View File

@ -0,0 +1,22 @@
--- tkKinput2.c.orig Mon Dec 18 21:46:48 2006
+++ tkKinput2.c Mon Dec 18 22:14:27 2006
@@ -552,6 +552,8 @@
XEvent *event));
static int stopForwarding _ANSI_ARGS_ ((ClientData clientdata,
XErrorEvent *errEvent));
+static int checkProtocols _ANSI_ARGS_ ((Display *dpy,
+ Window window, ConversionAtoms *cap));
/*
*--------------------------------------------------------------
@@ -585,8 +587,10 @@
ConversionAtoms *cap;
ConversionContext *context;
int anyattr = False;
+ /* for gcc41
static int checkProtocols _ANSI_ARGS_ ((Display *dpy,
Window window, ConversionAtoms *cap));
+ */
cap = getAtoms(tkwin);

View File

@ -175,12 +175,6 @@ lib/tk8.0jp/images/pwrdLogo150.gif
lib/tk8.0jp/images/pwrdLogo175.gif
lib/tk8.0jp/images/pwrdLogo200.gif
lib/tk8.0jp/images/pwrdLogo75.gif
share/doc/tk8.0jp/README
share/doc/tk8.0jp/changes
share/doc/tk8.0jp/README.JP
share/doc/tk8.0jp/changes.JP
share/doc/tk8.0jp/Incompat80jp
share/doc/tk8.0jp/README.FreeBSD.JP
@dirrm include/tk8.0jp/generic
@dirrm include/tk8.0jp/unix
@dirrm include/tk8.0jp