1 files changed, 11 insertions, 33 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 0c38d3e3a0b..e95db1d1cf1 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2008/03/09 20:56:57 bjs Exp $
+# $NetBSD: Makefile,v 1.71 2008/03/11 10:16:42 tron Exp $
 
-DISTNAME=	rsync-3.0.0
+DISTNAME=	rsync-2.6.9
 CATEGORIES=	net
+PKGREVISION=	1
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		http://rsync.samba.org/ftp/rsync/old-versions/  \
 		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
@@ -14,43 +15,20 @@ COMMENT=	Network file distribution/synchronisation utility
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync
+
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-included-popt \
+			--with-rsyncd-conf=${PKG_SYSCONFDIR}/rsyncd.conf
 TEST_TARGET=		test
-USE_LIBTOOL=		yes
-
-CONFIGURE_ARGS+=	--with-included-popt
-CONFIGURE_ARGS+=	--with-rsyncd-conf=${${PKG_SYSCONFDIR}/rsyncd.conf:L:Q}
-CONFIGURE_SCRIPT=	configure.sh
 
-CONF_FILES=		${EGDIR}/rsyncd.conf ${PKG_SYSCONFDIR}/rsyncd.conf
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 PKG_SYSCONFSUBDIR=	rsync
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	${WRKDIR}/rsyncd.conf rsync.1 rsyncd.conf.5
-SUBST_SED.paths=	-e 's|/etc/rsyncd|${PKG_SYSCONFDIR}/rsyncd|g'
-SUBST_SED.paths+=	-e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g'
-SUBST_VARS.paths=	VARBASE
-
-.PHONY: install-examples
-install-examples:
-	${RUN} \
-	    ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} && \
-	    ${INSTALL_DATA} ${WRKDIR}/rsyncd.conf  ${DESTDIR}${EGDIR}
-post-extract:
-	${RUN} \
-	    ${CP} ${FILESDIR}/rsyncd.conf ${WRKDIR}
-post-install: install-examples
-	${RUN} \
-	    ${INSTALL_DATA_DIR} \
-		${DESTDIR}${PREFIX}/share/doc/${PKGBASE} && \
-	    ${INSTALL_DATA} ${WRKSRC}/tech_report.tex \
-		${DESTDIR}${PREFIX}/share/doc/${PKGBASE} && \
-	    ${INSTALL_DATA} ${WRKSRC}/README \
-		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-
-.include "options.mk"
-.include "../../converters/libiconv/buildlink3.mk"
+SUBST_FILES.paths=	rsync.h rsync.1 rsyncd.conf.5
+SUBST_SED.paths=	-e 's|/etc/rsyncd|${PKG_SYSCONFDIR}/rsyncd|g' \
+			-e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g'
+
 .include "../../mk/bsd.pkg.mk"