Re: ADJUST: Tcl/Tk to use bsd.port.arch.mk

2011-10-26 Thread Stuart Cassoff
ok?



ADJUST: Tcl/Tk to use bsd.port.arch.mk

2011-10-18 Thread Stuart Cassoff
Use bsd.port.arch.mk.
I don't know if it makes the Makefiles any prettier. ;)


Index: lang/tcl/8.5/Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- lang/tcl/8.5/Makefile   17 Oct 2011 15:18:39 -  1.17
+++ lang/tcl/8.5/Makefile   18 Oct 2011 06:54:57 -
@@ -46,13 +46,6 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
EXTRA_INSTALL=install-private-headers \
SHLIB_VERSION=${LIBtcl85_VERSION}

-.if ${MACHINE_ARCH} != m88k  ${MACHINE_ARCH} != vax
-ALL_TARGET =   all libtcl85.a
-CONFIGURE_ARGS +=  EXTRA_INSTALL_BINARIES='@echo Installing libtcl85.a to 
$$(LIB_INSTALL_DIR)/ \
-$$(INSTALL_DATA) libtcl85.a 
$$(LIB_INSTALL_DIR)/libtcl85.a \
-(cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtcl85.a)'
-.endif
-
 FLAVORS =  threaded
 FLAVOR ?=

@@ -61,6 +54,15 @@ CONFIGURE_ARGS +=--enable-threads
 WANTLIB += pthread
 .endif

+.include bsd.port.arch.mk
+
+.if ${NO_SHARED_LIBS:L} == no
+ALL_TARGET =   all libtcl85.a
+CONFIGURE_ARGS +=  EXTRA_INSTALL_BINARIES='@echo Installing libtcl85.a to 
$$(LIB_INSTALL_DIR)/ \
+$$(INSTALL_DATA) libtcl85.a 
$$(LIB_INSTALL_DIR)/libtcl85.a \
+(cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtcl85.a)'
+.endif
+
 WRKSRC =   ${WRKDIST}/unix
 REGRESS_TARGET =   test
 SUBST_VARS +=  _README_DIR
@@ -72,7 +74,7 @@ pre-regress:

 post-install:
${INSTALL_DATA} ${WRKDIST}/license.terms ${PREFIX}/lib/tcl/tcl8.5/man
-.if ${MACHINE_ARCH} != m88k  ${MACHINE_ARCH} != vax
+.if ${NO_SHARED_LIBS:L} == no
ln -s libtcl85.a ${PREFIX}/lib/libtcl85_pic.a
ln -s libtclstub85.a ${PREFIX}/lib/libtclstub85_pic.a
 .endif




Index: x11/tk/8.5/Makefile
===
RCS file: /cvs/ports/x11/tk/8.5/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- x11/tk/8.5/Makefile 17 Oct 2011 15:19:22 -  1.23
+++ x11/tk/8.5/Makefile 18 Oct 2011 07:04:22 -
@@ -51,15 +51,6 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
EXTRA_CC_SWITCHES=-I${LOCALBASE}/include/tcl8.5 \
SHLIB_VERSION=${LIBtk85_VERSION}

-.if ${MACHINE_ARCH} != m88k  ${MACHINE_ARCH} != vax
-ALL_TARGET =   all libtk85.a
-CONFIGURE_ARGS +=  EXTRA_INSTALL_BINARIES='@echo Installing libtk85.a to 
$$(LIB_INSTALL_DIR)/ \
-$$(INSTALL_DATA) libtk85.a 
$$(LIB_INSTALL_DIR)/libtk85.a \
-(cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtk85.a)'
-.endif
-
-REGRESS_IS_INTERACTIVE = x11
-
 FLAVORS =  threaded
 FLAVOR ?=

@@ -71,6 +62,16 @@ LIB_DEPENDS +=   tcl-=8.5.10,8.5.11-thr
 LIB_DEPENDS += tcl-=8.5.10,8.5.11-!threaded:lang/tcl/8.5
 .endif

+.include bsd.port.arch.mk
+
+.if ${NO_SHARED_LIBS:L} == no
+ALL_TARGET =   all libtk85.a
+CONFIGURE_ARGS +=  EXTRA_INSTALL_BINARIES='@echo Installing libtk85.a to 
$$(LIB_INSTALL_DIR)/ \
+$$(INSTALL_DATA) libtk85.a 
$$(LIB_INSTALL_DIR)/libtk85.a \
+(cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtk85.a)'
+.endif
+
+REGRESS_IS_INTERACTIVE = x11
 WRKSRC =   ${WRKDIST}/unix
 REGRESS_TARGET =   test

@@ -81,7 +82,7 @@ pre-regress:

 post-install:
${INSTALL_DATA} ${WRKDIST}/license.terms ${PREFIX}/lib/tcl/tk8.5/man
-.if ${MACHINE_ARCH} != m88k  ${MACHINE_ARCH} != vax
+.if ${NO_SHARED_LIBS:L} == no
ln -s libtk85.a ${PREFIX}/lib/libtk85_pic.a
ln -s libtkstub85.a ${PREFIX}/lib/libtkstub85_pic.a
 .endif