sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-08 14:20:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- use configures --includedir

Browse source 
- cleanup makefile
This commit is contained in:
Dirk Meyer 2003-05-14 04:19:00 +00:00
parent 27c157aee2
commit 9173f05631
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=80955
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x11-toolkits/tk84/Makefile
View file

@ -26,7 +26,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
TK_VER= 8.4 TK_VER= 8.4
SHORT_TK_VER= 84 SHORT_TK_VER= 84
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 CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER} PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
@ -35,7 +36,6 @@ PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish
NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
TCL84_PORT?= lang/tcl84 TCL84_PORT?= lang/tcl84
USE_REINPLACE= YES USE_REINPLACE= YES
MANCOMPRESSED= no MANCOMPRESSED= no
MAN1= wish.1 MAN1= wish.1
@ -340,12 +340,12 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
text.n tk_textCut.n \ text.n tk_textCut.n \
text.n tk_textPaste.n text.n tk_textPaste.n
.include <bsd.port.pre.mk>
post-configure: post-configure:
${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \ ${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
${WRKSRC}/tkConfig.sh ${WRKSRC}/tkConfig.sh
.include <bsd.port.pre.mk>
post-install: post-install:
${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/ ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
.if exists(${PKGINSTALL}) .if exists(${PKGINSTALL})

2
x11-toolkits/tk84/files/patch-ab
View file

@ -5,7 +5,7 @@
# Directory in which to install the include file tk.h: # Directory in which to install the include file tk.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -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 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix