summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorErnst de Haan <znerd@FreeBSD.org>2003-02-28 08:48:13 +0000
committerErnst de Haan <znerd@FreeBSD.org>2003-02-28 08:48:13 +0000
commit143631ae753ffcf2d6ab705e5d1a4e6110b4bcd7 (patch)
tree6b29cac279c7495f676ec3595da552ff061621b7 /devel
parentUpdate to 0.6.5 (diff)
Fixing previous commit. The antRun script should go in the 'bin'
subdirectory of the port installation directory, not in ${PREFIX}/bin. Bumped PORTREVISION. Indicated by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes: svn path=/head/; revision=76617
Diffstat (limited to 'devel')
-rw-r--r--devel/apache-ant/Makefile5
-rw-r--r--devel/apache-ant/pkg-plist3
-rw-r--r--devel/jakarta-ant/Makefile5
-rw-r--r--devel/jakarta-ant/pkg-plist3
4 files changed, 10 insertions, 6 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index c793cbd23d8c..d535a7a3e773 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jakarta-ant
PORTVERSION= 1.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel java
MASTER_SITES= http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
http://www.metaverse.nl/~ernst/ \
@@ -55,13 +55,14 @@ post-patch:
do-install:
@${ECHO_CMD} -n ">> Creating destination directory..."
+ @${MKDIR} ${PORTDESTDIR}/bin
@${MKDIR} ${PORTDESTDIR}/lib
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Installing scripts..."
@cd ${INSTALL_WRKSRC}; \
${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin; \
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PREFIX}/bin;
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PORTDESTDIR}/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 df2ce79a08cc..be827d21f6c7 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -1,5 +1,5 @@
bin/ant
-bin/antRun
+%%T%%/bin/antRun
%%T%%/lib/ant.jar
%%T%%/lib/optional.jar
%%T%%/lib/README
@@ -1005,6 +1005,7 @@ bin/antRun
%%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 c793cbd23d8c..d535a7a3e773 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jakarta-ant
PORTVERSION= 1.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel java
MASTER_SITES= http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
http://www.metaverse.nl/~ernst/ \
@@ -55,13 +55,14 @@ post-patch:
do-install:
@${ECHO_CMD} -n ">> Creating destination directory..."
+ @${MKDIR} ${PORTDESTDIR}/bin
@${MKDIR} ${PORTDESTDIR}/lib
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Installing scripts..."
@cd ${INSTALL_WRKSRC}; \
${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin; \
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PREFIX}/bin;
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PORTDESTDIR}/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 df2ce79a08cc..be827d21f6c7 100644
--- a/devel/jakarta-ant/pkg-plist
+++ b/devel/jakarta-ant/pkg-plist
@@ -1,5 +1,5 @@
bin/ant
-bin/antRun
+%%T%%/bin/antRun
%%T%%/lib/ant.jar
%%T%%/lib/optional.jar
%%T%%/lib/README
@@ -1005,6 +1005,7 @@ bin/antRun
%%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