diff options
| author | netchild <netchild@FreeBSD.org> | 2003-12-10 20:27:31 +0800 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2003-12-10 20:27:31 +0800 |
| commit | c54e36aeb3cc21304d87dde4dc907c22d144d3f8 (patch) | |
| tree | 932536ceafd30b527c34fb6ae8dcaf529a658887 /www/interchange/Makefile | |
| parent | fd4f2a3a9bb65f5d17371054eaf6e4e6abd8e2ca (diff) | |
| download | freebsd-ports-gnome-c54e36aeb3cc21304d87dde4dc907c22d144d3f8.tar.gz freebsd-ports-gnome-c54e36aeb3cc21304d87dde4dc907c22d144d3f8.tar.zst freebsd-ports-gnome-c54e36aeb3cc21304d87dde4dc907c22d144d3f8.zip | |
Ooops... instead of removing the perl 5.8 test completely revert
to check for perl 5.6.1 or better. [1]
Remove -DCHECK_FOR_IC_USER from MAKE_ARGS, it's not needed there.
Noticed by: erwin [1]
Diffstat (limited to 'www/interchange/Makefile')
| -rw-r--r-- | www/interchange/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/www/interchange/Makefile b/www/interchange/Makefile index c078f1a084da..a07052d8977f 100644 --- a/www/interchange/Makefile +++ b/www/interchange/Makefile @@ -42,8 +42,7 @@ MAKE_ARGS+= NOCPANINSTALL=1 \ INSTALLARCHLIB=${PREFIX}/interchange \ INSTALLPRIVLIB=${PREFIX}/interchange/lib/ \ INSTALLMAN1DIR=${PREFIX}/man/man1 \ - INSTALLMAN3DIR=${PREFIX}/man/man7 \ - -DCHECK_FOR_IC_USER + INSTALLMAN3DIR=${PREFIX}/man/man7 CONFIGURE_ARGS+= force=1 @@ -55,6 +54,9 @@ post-patch: @${REINPLACE_CMD} -e "s:You are now ready to cd to \$$realdir:You are now ready to cd to ${PREFIX}:g" ${WRKSRC}/Makefile.PL pre-configure: +.if !defined(USE_THIS_PERL) + @[ ! "${PERL_VER}" \< "5.6.1" ] || ( ${ECHO_CMD} -e "You use perl ${PERL_VER}, interchange should be used with 5.6.1 or better,\njust install the newer perl from ports and run 'use.perl port', this will\nmake the new perl the default perl. If you already have some perl modules\ninstalled for your old perl, you have to reinstall them for the new perl.\n\nIf you absolutely want to try to run interchange with perl ${PERL_VER},\nyou have to add '-DUSE_THIS_PERL' as an option for 'make'.\n" ; exit 1 ) +.endif .if !defined(CHECK_FOR_IC_USER) @${ECHO_CMD} -e "This port needs a specific user account ('interch') at configure time.\n\nIf it is ok for you to add a new user at configure time of this port\nadd '-DCHECK_FOR_IC_USER' as an option for 'make'.\n" @exit 1 |