From 068880021430396650339297afbe6e059c8e6a88 Mon Sep 17 00:00:00 2001 From: Daniel Eischen Date: Sun, 10 Feb 2002 00:57:45 +0000 Subject: Always remove the .orig files from the examples directory; there's no sense in muddying up the Makefile with checks for NOPORTDOCS just to remove the copy of one patched file. Make the package list be in alphabetical order for directories with lots of files in them; this allows one to do `/bin/ls -1` to generate the package list and produce (hopefully) smaller diffs for subsequent versions. --- lang/gnat/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lang/gnat/Makefile') diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile index 6b257156123c..7a7f6a17a1ec 100644 --- a/lang/gnat/Makefile +++ b/lang/gnat/Makefile @@ -138,12 +138,14 @@ pre-patch: @${ECHO} "===> Making way for FreeBSD GNAT support files" -( ${RM} -f ${WRKSRC}/ada/[45]f* ) -# Copy any additional files required into the correct locations. +# Copy any additional files required into the correct locations, and also +# remove .orig files leftover from patching so they won't get installed. post-patch: (cd ${FILESDIR}; \ for i in *.adb *.ads ; do \ ${CP} $$i ${WRKSRC}/ada; \ done ) + ${RM} ${WRKDIR}/gnat-3.14p-src/examples/*.orig pre-configure: @(cd ${WRKSRC}/config/${ARCH}/ ; \ @@ -188,9 +190,6 @@ do-build: ${RM} ${WRKSRC}/stamp-gnatlib2 (cd ${WRKSRC}; \ ${GMAKE} CFLAGS="${GNATCFLAGS}" GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib ) -.ifndef(NOPORTDOCS) - ${RM} ${WRKDIR}/gnat-3.14p-src/examples/*.orig -.endif do-install: (cd ${WRKSRC}; \ -- cgit v1.2.3