diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-05-14 04:10:27 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-05-14 04:10:27 +0000 |
| commit | 27c157aee2aaf95a422db2a7debd26f63e62dcea (patch) | |
| tree | a97386b8aa11188f606b38e65bb17718f732e262 | |
| parent | - cleanup makefile (diff) | |
- use configures --includedir
- cleanup makefile
Notes
Notes:
svn path=/head/; revision=80954
| -rw-r--r-- | x11-toolkits/tk83/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/tk83/files/patch-ab | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile index a5f66e08b439..873d2aec3857 100644 --- a/x11-toolkits/tk83/Makefile +++ b/x11-toolkits/tk83/Makefile @@ -25,7 +25,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix GNU_CONFIGURE= yes TK_VER= 8.3 SHORT_TK_VER= 83 -CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${TK_VER} +CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${TK_VER} \ + --includedir=${LOCALBASE}/include/tk${TK_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER} @@ -34,7 +35,6 @@ PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html TCL83_PORT?= lang/tcl83 USE_REINPLACE= YES - MANCOMPRESSED= no MAN1= wish.1 @@ -319,12 +319,12 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ palette.n tk_bisque.n \ popup.n tk_popup.n +.include <bsd.port.pre.mk> + post-configure: ${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \ ${WRKSRC}/tkConfig.sh -.include <bsd.port.pre.mk> - post-install: ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/ .if exists(${PKGINSTALL}) diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab index 244e54dbb8b6..354172c7ef89 100644 --- a/x11-toolkits/tk83/files/patch-ab +++ b/x11-toolkits/tk83/files/patch-ab @@ -5,7 +5,7 @@ # Directory in which to install the include file tk.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tk$(VERSION) ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix |