diff options
| -rw-r--r-- | palm/pilot-link-devel/Makefile | 19 | ||||
| -rw-r--r-- | palm/pilot-link-devel/pkg-plist | 10 | ||||
| -rw-r--r-- | palm/pilot-link/Makefile | 19 | ||||
| -rw-r--r-- | palm/pilot-link/pkg-plist | 10 |
4 files changed, 38 insertions, 20 deletions
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile index c9b118d84991..cbe142050468 100644 --- a/palm/pilot-link-devel/Makefile +++ b/palm/pilot-link-devel/Makefile @@ -8,15 +8,13 @@ PORTNAME= pilot-link PORTVERSION= 0.11.8 PORTREVISION= 3 -CATEGORIES= palm comms tk84 +CATEGORIES= palm comms MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles MAINTAINER= ports@FreeBSD.org COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...) -LIB_DEPENDS= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} - USE_ICONV= yes USE_GETOPT_LONG=yes USE_BZIP2= yes @@ -27,9 +25,20 @@ TCL_VER?= 8.4 CFLAGS+= -I${LOCALBASE}/include HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} --with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER}/ --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}/ --program-transform-name= +CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} --program-transform-name= CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +OPTIONS= TCL "Build Tcl/Tk bindings" off + .include "${.CURDIR}/manpages.mk" +.include <bsd.port.pre.mk> + +.if defined(WITH_TCL) +LIB_DEPENDS+= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} +CONFIGURE_ARGS+=--with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER}/ --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}/ +PLIST_SUB+= WITH_TCL="" +.else +PLIST_SUB+= WITH_TCL="@comment " +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/palm/pilot-link-devel/pkg-plist b/palm/pilot-link-devel/pkg-plist index b28797a57e26..6e8ab5ad0eb5 100644 --- a/palm/pilot-link-devel/pkg-plist +++ b/palm/pilot-link-devel/pkg-plist @@ -28,7 +28,7 @@ bin/pilot-foto bin/pilot-prc bin/pilot-schlep bin/pilot-xfer -bin/pitclsh +%%WITH_TCL%%bin/pitclsh bin/read-expenses bin/read-ical bin/read-notepad @@ -86,10 +86,10 @@ lib/libpisync.a lib/libpisync.la lib/libpisync.so lib/libpisync.so.0 -lib/libpitcl.a -lib/libpitcl.la -lib/libpitcl.so.0 -lib/libpitcl.so +%%WITH_TCL%%lib/libpitcl.a +%%WITH_TCL%%lib/libpitcl.la +%%WITH_TCL%%lib/libpitcl.so.0 +%%WITH_TCL%%lib/libpitcl.so share/aclocal/pilot-link.m4 share/pilot-link/getrom.prc share/pilot-link/getrom2.prc diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index c9b118d84991..cbe142050468 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -8,15 +8,13 @@ PORTNAME= pilot-link PORTVERSION= 0.11.8 PORTREVISION= 3 -CATEGORIES= palm comms tk84 +CATEGORIES= palm comms MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles MAINTAINER= ports@FreeBSD.org COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...) -LIB_DEPENDS= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} - USE_ICONV= yes USE_GETOPT_LONG=yes USE_BZIP2= yes @@ -27,9 +25,20 @@ TCL_VER?= 8.4 CFLAGS+= -I${LOCALBASE}/include HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} --with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER}/ --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}/ --program-transform-name= +CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} --program-transform-name= CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +OPTIONS= TCL "Build Tcl/Tk bindings" off + .include "${.CURDIR}/manpages.mk" +.include <bsd.port.pre.mk> + +.if defined(WITH_TCL) +LIB_DEPENDS+= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} +CONFIGURE_ARGS+=--with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER}/ --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}/ +PLIST_SUB+= WITH_TCL="" +.else +PLIST_SUB+= WITH_TCL="@comment " +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist index b28797a57e26..6e8ab5ad0eb5 100644 --- a/palm/pilot-link/pkg-plist +++ b/palm/pilot-link/pkg-plist @@ -28,7 +28,7 @@ bin/pilot-foto bin/pilot-prc bin/pilot-schlep bin/pilot-xfer -bin/pitclsh +%%WITH_TCL%%bin/pitclsh bin/read-expenses bin/read-ical bin/read-notepad @@ -86,10 +86,10 @@ lib/libpisync.a lib/libpisync.la lib/libpisync.so lib/libpisync.so.0 -lib/libpitcl.a -lib/libpitcl.la -lib/libpitcl.so.0 -lib/libpitcl.so +%%WITH_TCL%%lib/libpitcl.a +%%WITH_TCL%%lib/libpitcl.la +%%WITH_TCL%%lib/libpitcl.so.0 +%%WITH_TCL%%lib/libpitcl.so share/aclocal/pilot-link.m4 share/pilot-link/getrom.prc share/pilot-link/getrom2.prc |