diff -ruN nuttcp/Makefile nuttcp1/Makefile --- nuttcp/Makefile 2009-08-17 10:04:47.000000000 +0400 +++ nuttcp1/Makefile 2009-08-21 08:28:52.000000000 +0400 @@ -11,7 +11,6 @@ MASTER_SITES= ftp://ftp.lcp.nrl.navy.mil/pub/${PORTNAME}/ \ ftp://ftp.lcp.nrl.navy.mil/pub/${PORTNAME}/beta/:beta DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${BETADISTFILE}:beta \ ${NUTTSCPDISTFILE}:beta EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -23,13 +22,10 @@ ALL_TARGET= ${PORTNAME} MAN8= ${PORTNAME}.8 -BETAVERSION= 6.2.10 -BETADISTFILE= ${DISTNAME:S|${PORTVERSION}|${BETAVERSION}|}.c NUTTSCPVERSION= 1.7 NUTTSCPDISTFILE=nuttscp-${NUTTSCPVERSION} -OPTIONS= NUTTSCP "Script for copying files using nuttcp" off \ - BETA "Use beta version" off +OPTIONS= NUTTSCP "Install script for copying files over nuttcp" on .include @@ -40,23 +36,17 @@ PLIST_SUB+= NUTTSCP="@comment " .endif -.if defined(WITH_BETA) -PKGVERSION= ${BETAVERSION} -PKGNAMESUFFIX= -devel - -post-extract: - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${BETADISTFILE} ${WRKSRC} - ( cd ${WRKSRC}; ${LN} -sf ${BETADISTFILE} ${PORTNAME}.c ) -.endif +post-extract: .SILENT + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${NUTTSCPDISTFILE} ${WRKDIR}/nuttscp post-patch: .SILENT ${FIND} ${WRKSRC}/ -type f -exec \ ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' {} + + ${REINPLACE_CMD} 's|/usr/bin/perl|${PERL}|g' ${WRKDIR}/nuttscp do-install: . if defined(WITH_NUTTSCP) - ${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/${NUTTSCPDISTFILE} \ - ${PREFIX}/bin/nuttscp + ${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${PREFIX}/bin/ ( cd ${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp ) . endif diff -ruN nuttcp/distinfo nuttcp1/distinfo --- nuttcp/distinfo 2009-08-17 09:37:58.000000000 +0400 +++ nuttcp1/distinfo 2009-08-21 08:24:20.000000000 +0400 @@ -1,9 +1,6 @@ MD5 (nuttcp-6.1.2.tar.bz2) = a16d4d6d5def02cea980e57feaf30500 SHA256 (nuttcp-6.1.2.tar.bz2) = 054e96d9d68fe917df6f25fab15c7755bdd480f6420d7d48d9194a1a52378169 SIZE (nuttcp-6.1.2.tar.bz2) = 77169 -MD5 (nuttcp-6.2.10.c) = c4b5d8ff4507153ecd7afc1c94e5c0d0 -SHA256 (nuttcp-6.2.10.c) = 52faad5c384538c44eaf5cb70590d0599083de15f0d11301cf717274f6f82f6b -SIZE (nuttcp-6.2.10.c) = 210573 MD5 (nuttscp-1.7) = 558335dfdd526015d1c5bbd3653490f7 SHA256 (nuttscp-1.7) = 71901d572ff2b472d2a3b7e1e4804c9d875b07e1a31e994b5f33d45d19111962 SIZE (nuttscp-1.7) = 18582