diff options
-rw-r--r-- | ftp/proftpd-devel/Makefile | 18 | ||||
-rw-r--r-- | ftp/proftpd-devel/distinfo | 4 | ||||
-rw-r--r-- | ftp/proftpd/Makefile | 18 | ||||
-rw-r--r-- | ftp/proftpd/distinfo | 4 |
4 files changed, 22 insertions, 22 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index dd5f418cefcc..249ce787b828 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= proftpd -PORTVERSION= 1.2.10 -PORTREVISION= 3 +DISTVERSION= 1.3.0rc2 +PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -101,22 +101,22 @@ LIBDIRS= .if defined(WITH_LDAP) USE_OPENLDAP= yes MODULES:=${MODULES}:mod_ldap -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif .if defined(WITH_MYSQL) USE_MYSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_mysql -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif .if defined(WITH_OPENSSL) @@ -181,7 +181,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/proftpd .endfor .for f in ${PORTDOCScontrib} - @${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${PREFIX}/share/doc/proftpd + @${INSTALL_DATA} ${WRKSRC}/doc/contrib/${f} ${PREFIX}/share/doc/proftpd .endfor .endif diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo index 8c1d2cd1de69..e498dd932f44 100644 --- a/ftp/proftpd-devel/distinfo +++ b/ftp/proftpd-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (proftpd-1.2.10.tar.bz2) = 5feb4a7348e12faefc25e34fd92efdd6 -SIZE (proftpd-1.2.10.tar.bz2) = 920337 +MD5 (proftpd-1.3.0rc2.tar.bz2) = 3faad77dba49262d26abd3f4f2e1c62d +SIZE (proftpd-1.3.0rc2.tar.bz2) = 1364496 diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index dd5f418cefcc..249ce787b828 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -6,8 +6,8 @@ # PORTNAME= proftpd -PORTVERSION= 1.2.10 -PORTREVISION= 3 +DISTVERSION= 1.3.0rc2 +PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -101,22 +101,22 @@ LIBDIRS= .if defined(WITH_LDAP) USE_OPENLDAP= yes MODULES:=${MODULES}:mod_ldap -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif .if defined(WITH_MYSQL) USE_MYSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_mysql -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif .if defined(WITH_OPENSSL) @@ -181,7 +181,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/proftpd .endfor .for f in ${PORTDOCScontrib} - @${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${PREFIX}/share/doc/proftpd + @${INSTALL_DATA} ${WRKSRC}/doc/contrib/${f} ${PREFIX}/share/doc/proftpd .endfor .endif diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo index 8c1d2cd1de69..e498dd932f44 100644 --- a/ftp/proftpd/distinfo +++ b/ftp/proftpd/distinfo @@ -1,2 +1,2 @@ -MD5 (proftpd-1.2.10.tar.bz2) = 5feb4a7348e12faefc25e34fd92efdd6 -SIZE (proftpd-1.2.10.tar.bz2) = 920337 +MD5 (proftpd-1.3.0rc2.tar.bz2) = 3faad77dba49262d26abd3f4f2e1c62d +SIZE (proftpd-1.3.0rc2.tar.bz2) = 1364496 |