From 803aa91504645cae858cb25dd16a1d8d28f82676 Mon Sep 17 00:00:00 2001 From: alane Date: Sun, 13 Oct 2002 13:04:06 +0000 Subject: 1. Made post-install DESTDIR-safe. 2. Made nicer message when USE_AUTOMAKE* is defined. 3. Removed unneeded WRKSRC= line. --- devel/automake/Makefile | 14 ++++++++++---- devel/automake110/Makefile | 14 ++++++++++---- devel/automake15/Makefile | 14 ++++++++++---- devel/automake16/Makefile | 14 ++++++++++---- devel/automake17/Makefile | 14 ++++++++++---- devel/automake18/Makefile | 14 ++++++++++---- devel/automake19/Makefile | 14 ++++++++++---- devel/gnu-automake/Makefile | 14 ++++++++++---- 8 files changed, 80 insertions(+), 32 deletions(-) (limited to 'devel') diff --git a/devel/automake/Makefile b/devel/automake/Makefile index d14e0c4..094872c 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index d14e0c4..094872c 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile index d14e0c4..094872c 100644 --- a/devel/automake15/Makefile +++ b/devel/automake15/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile index d14e0c4..094872c 100644 --- a/devel/automake16/Makefile +++ b/devel/automake16/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile index d14e0c4..094872c 100644 --- a/devel/automake17/Makefile +++ b/devel/automake17/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile index d14e0c4..094872c 100644 --- a/devel/automake18/Makefile +++ b/devel/automake18/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index d14e0c4..094872c 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index d14e0c4..094872c 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -17,18 +17,24 @@ MAINTAINER= ports@geeksrus.net GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes -WRKSRC= ${WRKDIR}/${DISTNAME} STRIP= # none .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-configure: ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in post-install: - @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir + @install-info ${DESTDIR}${PREFIX}/info/automake.info \ + ${DESTDIR}${PREFIX}/info/dir .include -- cgit v1.1