diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apache-ant/Makefile | 10 | ||||
| -rw-r--r-- | devel/apache-ant/pkg-plist | 4 | ||||
| -rw-r--r-- | devel/jakarta-ant/Makefile | 10 | ||||
| -rw-r--r-- | devel/jakarta-ant/pkg-plist | 4 |
4 files changed, 8 insertions, 20 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 9896a667c25f..b213e122f116 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-ant PORTVERSION= 1.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel java MASTER_SITES= http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ @@ -27,7 +27,6 @@ PORTDESTDIR= ${PREFIX}/${PORTNAME}-${PORTVERSION} PLIST_SUB+= T=${PORTDESTDIR:S/^${PREFIX}\///} READMES= LICENSE README WHATSNEW -SCRIPTS= bin/ant bin/antRun bin/runant.pl ANT_VERSION= ${PORTVERSION} DATADIRS= lib @@ -56,13 +55,12 @@ post-patch: do-install: @${ECHO_CMD} -n ">> Creating destination directory..." - @${MKDIR} ${PORTDESTDIR}/bin ${PORTDESTDIR}/lib + @${MKDIR} ${PORTDESTDIR}/lib @${ECHO_CMD} " [ DONE ]" - @${ECHO_CMD} -n ">> Installing scripts..." + @${ECHO_CMD} -n ">> Installing script..." @cd ${INSTALL_WRKSRC}; \ - ${INSTALL_SCRIPT} ${SCRIPTS} ${PORTDESTDIR}/bin; - @${LN} -sf ${PORTDESTDIR}/bin/ant ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin; @${ECHO_CMD} " [ DONE ]" @${ECHO_CMD} -n ">> Installing readme files..." diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist index 55c97921905f..7dbccbd46272 100644 --- a/devel/apache-ant/pkg-plist +++ b/devel/apache-ant/pkg-plist @@ -1,7 +1,4 @@ bin/ant -%%T%%/bin/ant -%%T%%/bin/antRun -%%T%%/bin/runant.pl %%T%%/lib/ant.jar %%T%%/lib/optional.jar %%T%%/lib/README @@ -1009,7 +1006,6 @@ bin/ant %%T%%/docs/problems.html %%T%%/docs/projects.html %%T%%/docs/resources.html -@dirrm %%T%%/bin @dirrm %%T%%/lib @dirrm %%T%%/docs/ant2 @dirrm %%T%%/docs/images diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile index 9896a667c25f..b213e122f116 100644 --- a/devel/jakarta-ant/Makefile +++ b/devel/jakarta-ant/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-ant PORTVERSION= 1.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel java MASTER_SITES= http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ @@ -27,7 +27,6 @@ PORTDESTDIR= ${PREFIX}/${PORTNAME}-${PORTVERSION} PLIST_SUB+= T=${PORTDESTDIR:S/^${PREFIX}\///} READMES= LICENSE README WHATSNEW -SCRIPTS= bin/ant bin/antRun bin/runant.pl ANT_VERSION= ${PORTVERSION} DATADIRS= lib @@ -56,13 +55,12 @@ post-patch: do-install: @${ECHO_CMD} -n ">> Creating destination directory..." - @${MKDIR} ${PORTDESTDIR}/bin ${PORTDESTDIR}/lib + @${MKDIR} ${PORTDESTDIR}/lib @${ECHO_CMD} " [ DONE ]" - @${ECHO_CMD} -n ">> Installing scripts..." + @${ECHO_CMD} -n ">> Installing script..." @cd ${INSTALL_WRKSRC}; \ - ${INSTALL_SCRIPT} ${SCRIPTS} ${PORTDESTDIR}/bin; - @${LN} -sf ${PORTDESTDIR}/bin/ant ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin; @${ECHO_CMD} " [ DONE ]" @${ECHO_CMD} -n ">> Installing readme files..." diff --git a/devel/jakarta-ant/pkg-plist b/devel/jakarta-ant/pkg-plist index 55c97921905f..7dbccbd46272 100644 --- a/devel/jakarta-ant/pkg-plist +++ b/devel/jakarta-ant/pkg-plist @@ -1,7 +1,4 @@ bin/ant -%%T%%/bin/ant -%%T%%/bin/antRun -%%T%%/bin/runant.pl %%T%%/lib/ant.jar %%T%%/lib/optional.jar %%T%%/lib/README @@ -1009,7 +1006,6 @@ bin/ant %%T%%/docs/problems.html %%T%%/docs/projects.html %%T%%/docs/resources.html -@dirrm %%T%%/bin @dirrm %%T%%/lib @dirrm %%T%%/docs/ant2 @dirrm %%T%%/docs/images |