diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2009-08-09 20:38:22 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2009-08-09 20:38:22 +0000 |
| commit | e39f04804e94b72fa75d76d8c09ebf8bb7f883c3 (patch) | |
| tree | f13771e3eea2cf0cbd48e89c336beab7bdbab2d5 | |
| parent | Add slony1v2. (diff) | |
Cleanup after importing databases/slony1v2:
* Reduce diff with databases/slony1v2 (use DISTNAME).
* Document conflict with slony1v2.
* Remove unused code in post-install target.
Notes
Notes:
svn path=/head/; revision=239221
| -rw-r--r-- | databases/slony1/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile index 1f68cc41285c..25d24f80a5de 100644 --- a/databases/slony1/Makefile +++ b/databases/slony1/Makefile @@ -9,8 +9,8 @@ PORTNAME= slony1 PORTVERSION= 1.2.16 CATEGORIES= databases MASTER_SITES= http://main.slony.info/downloads/1.2/source/ -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}-${PORTVERSION}-docs${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${DISTNAME}-docs${EXTRACT_SUFX} MAINTAINER= vivek@khera.org COMMENT= PostgreSQL master to multiple replicas replication system @@ -28,6 +28,8 @@ SUB_LIST+= NAME=slon OPTIONS= PERLTOOLS "Install perl configuration tools" Off +CONFLICTS?= slony1v2-* + .include <bsd.port.pre.mk> IGNORE_WITH_PGSQL= 84 @@ -76,7 +78,6 @@ post-install: ${MKDIR} ${DOCSDIR}/adminguide ${MKDIR} ${DOCSDIR}/howto ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${WRKSRC}/INSTALL ${WRKSRC}/SAMPLE ${WRKSRC}/README ${WRKSRC}/HISTORY-1.1 ${WRKSRC}/UPGRADING ${DOCSDIR} -# ${INSTALL_DATA} ${WRKSRC}/doc/*/*.pdf ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/howto/*.txt ${WRKSRC}/doc/howto/*.html ${DOCSDIR}/howto/ ${INSTALL_DATA} ${WRKSRC}/doc/adminguide/*.html ${WRKSRC}/doc/adminguide/*.png ${DOCSDIR}/adminguide/ .endif |