diff options
| author | John Marino <marino@FreeBSD.org> | 2014-10-16 09:43:26 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-10-16 09:43:26 +0000 |
| commit | 56f1882672d06a32ee3273daf3b3f0ad0d6fd61c (patch) | |
| tree | 9eddd5026b0e5563b6a9b9372291a8202965a118 | |
| parent | 6e6d9a7ee29777e68d9e878bf2aca6c9ba542f55 (diff) | |
| download | ports-56f1882672d06a32ee3273daf3b3f0ad0d6fd61c.tar.gz ports-56f1882672d06a32ee3273daf3b3f0ad0d6fd61c.zip | |
Notes
| -rw-r--r-- | archivers/zip-ada/Makefile | 22 | ||||
| -rw-r--r-- | archivers/zip-ada/pkg-plist | 4 |
2 files changed, 11 insertions, 15 deletions
diff --git a/archivers/zip-ada/Makefile b/archivers/zip-ada/Makefile index b92c736f8ce4..d8d1f0e3fb4f 100644 --- a/archivers/zip-ada/Makefile +++ b/archivers/zip-ada/Makefile @@ -22,7 +22,7 @@ DEMOS= demo_zip demo_unzip ziptest demo_csv_into_zip test_extract \ zip_with_many_files do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P zipada.gpr + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P zipada.gpr) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin \ @@ -32,20 +32,20 @@ do-install: ${STAGEDIR}${PREFIX}/lib/gnat @${MKDIR} ${WRKSRC}/obj_tools ${WRKSRC}/obj_demos .for F in ${ZTOOLS} - @${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/bin/ - @${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_tools/ + ${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/bin/ + ${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_tools/ .endfor .for F in ${DEMOS} - @${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${EXAMPLESDIR}/ - @${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_demos/ + ${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${EXAMPLESDIR}/ + ${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_demos/ .endfor - @cd ${WRKSRC}/obj_opt && ${AR} rcs libzip-ada.a *.o - @${MV} ${STAGEDIR}${PREFIX}/bin/bunzip ${STAGEDIR}${PREFIX}/bin/debzip2 - @${INSTALL_DATA} ${WRKSRC}/zip_lib/*.ad[sb] \ + (cd ${WRKSRC}/obj_opt && ${AR} rcs libzip-ada.a *.o) + ${MV} ${STAGEDIR}${PREFIX}/bin/bunzip ${STAGEDIR}${PREFIX}/bin/debzip2 + ${INSTALL_DATA} ${WRKSRC}/zip_lib/*.ad[sb] \ ${STAGEDIR}${PREFIX}/include/zip-ada/ - @${INSTALL_DATA} ${WRKSRC}/obj_opt/*.ali \ + ${INSTALL_DATA} ${WRKSRC}/obj_opt/*.ali \ ${STAGEDIR}${PREFIX}/lib/zip-ada/ - @${INSTALL_LIB} ${WRKSRC}/obj_opt/*.a ${STAGEDIR}${PREFIX}/lib/zip-ada/ - @${INSTALL_DATA} ${FILESDIR}/zip-ada.gpr ${STAGEDIR}${PREFIX}/lib/gnat/ + ${INSTALL_LIB} ${WRKSRC}/obj_opt/*.a ${STAGEDIR}${PREFIX}/lib/zip-ada/ + ${INSTALL_DATA} ${FILESDIR}/zip-ada.gpr ${STAGEDIR}${PREFIX}/lib/gnat/ .include <bsd.port.mk> diff --git a/archivers/zip-ada/pkg-plist b/archivers/zip-ada/pkg-plist index a166c38c1861..f13b7a9a4f62 100644 --- a/archivers/zip-ada/pkg-plist +++ b/archivers/zip-ada/pkg-plist @@ -75,7 +75,3 @@ lib/zip-ada/zip_streams.ali %%EXAMPLESDIR%%/za_gnat %%EXAMPLESDIR%%/zip_with_many_files %%EXAMPLESDIR%%/ziptest -@dirrm lib/zip-ada -@dirrm include/zip-ada -@dirrm %%EXAMPLESDIR%% -@dirrmtry lib/gnat |