diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2002-01-06 20:47:38 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2002-01-06 20:47:38 +0000 |
| commit | 06c2ca48a63f148c1a59bc637d45c584933d02b9 (patch) | |
| tree | ef9c0eb67d1753d1ba5a374a344e799fb1474eb4 | |
| parent | o don't grok ${FILESDIR} for Wraphelp.c. (diff) | |
move pre.mk inclusion to the bottom.
Notes
Notes:
svn path=/head/; revision=52667
| -rw-r--r-- | x11/XFree86-4-clients/Makefile | 14 | ||||
| -rw-r--r-- | x11/XFree86-4-manuals/Makefile | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 77b01abbbd77..2e383a28cbb7 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -56,9 +56,8 @@ HasPam?= DEFAULT .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -pre-fetch: - @${ECHO} - @${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c. +pre-everything:: + @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c." .else MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ @@ -66,11 +65,8 @@ MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ EXTRACT_ONLY= X410src-1.tgz DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c -.endif -.endif - -.include <bsd.port.pre.mk> -.include "${FILESDIR}/manpages" +.endif # USA_RESIDENT +.endif # HasXdmAuth post-extract: ( cd ${WRKDIR} && \ @@ -81,4 +77,6 @@ post-extract: do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +.include <bsd.port.pre.mk> +.include "${FILESDIR}/manpages" .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index b724aef96b7d..fe13eff18170 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -25,9 +25,6 @@ DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc/doc/man INSTALL_TARGET= install.man -.include <bsd.port.pre.mk> -.include <${FILESDIR}/manpages> - do-configure: (cd ${WRKSRC} && \ imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \ @@ -36,4 +33,6 @@ do-configure: ${MAKE} includes ; \ ${MAKE} depend) +.include <bsd.port.pre.mk> +.include "${FILESDIR}/manpages" .include <bsd.port.post.mk> |