Index: head/ftp/ncftp3/Makefile
===================================================================
--- head/ftp/ncftp3/Makefile	(revision 27884)
+++ head/ftp/ncftp3/Makefile	(revision 27885)
@@ -1,58 +1,51 @@
 # ex:ts=8
 # Ports collection makefile for:  ncftp3
 # Date created:			  4 Nov 1994
 # Whom:				  ache
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ncftp3
 PORTVERSION=	3.0.1
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 DISTNAME=	ncftp-${PORTVERSION}-src
 
 MAINTAINER=	obrien@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ncurses
 MAN1=		ncftp3.1 ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1
 MAN3=		Strn.3
 
-.include <bsd.port.pre.mk>
+LIBNCFTP=	libncftp.so.2
+LIBSTRN=	libStrn.so.1
 
-.if ${PORTOBJFORMAT} == "elf"
-LIBNCFTP= libncftp.so.2
-LIBSTRN=libStrn.so.1
-.else
-LIBNCFTP= libncftp.so.2.0
-LIBSTRN=libStrn.so.1.0
-.endif
-
 post-patch:
 	@${MV} ${WRKSRC}/ncftp/pref.h ${WRKSRC}/ncftp/pref.h.in
 	@${SED} -e 's:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:' \
 		${WRKSRC}/ncftp/pref.h.in > ${WRKSRC}/ncftp/pref.h
 
 pre-build:
 	cd ${WRKSRC}/Strn ; make so
 	cd ${WRKSRC}/libncftp ; make so
 
 do-install:
-	@$(INSTALL_PROGRAM) $(WRKSRC)/bin/ncftp $(PREFIX)/bin/ncftp3
-	@cd ${WRKSRC}/bin ; $(INSTALL_PROGRAM) \
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/ncftp ${PREFIX}/bin/ncftp3
+	@cd ${WRKSRC}/bin ; ${INSTALL_PROGRAM} \
 		ncftpbatch ncftpget ncftpls ncftpput ncftpbookmarks \
-		$(PREFIX)/bin
-	@$(INSTALL_DATA) $(WRKSRC)/Strn/libStrn.so.1 $(PREFIX)/lib/$(LIBSTRN)
-	@cd $(PREFIX)/lib && ${LN} -sf $(LIBSTRN) libStrn.so
-	@$(INSTALL_DATA) $(WRKSRC)/libncftp/libncftp.so.2 $(PREFIX)/lib/$(LIBNCFTP)
-	@cd $(PREFIX)/lib && ${LN} -sf $(LIBNCFTP) libncftp.so
+		${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/Strn/libStrn.so.1 ${PREFIX}/lib/${LIBSTRN}
+	@cd ${PREFIX}/lib && ${LN} -sf ${LIBSTRN} libStrn.so
+	@${INSTALL_DATA} ${WRKSRC}/libncftp/libncftp.so.2 ${PREFIX}/lib/${LIBNCFTP}
+	@cd ${PREFIX}/lib && ${LN} -sf ${LIBNCFTP} libncftp.so
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	@$(INSTALL_MAN) $(WRKSRC)/doc/man/ncftp.1 $(PREFIX)/man/man1/ncftp3.1
-	@cd ${WRKSRC}/doc/man ; $(INSTALL_MAN) \
+	@${INSTALL_MAN} ${WRKSRC}/doc/man/ncftp.1 ${PREFIX}/man/man1/ncftp3.1
+	@cd ${WRKSRC}/doc/man ; ${INSTALL_MAN} \
 		ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1 \
-		$(PREFIX)/man/man1
-	@$(INSTALL_MAN) $(WRKSRC)/Strn/Strn.3 $(PREFIX)/man/man3
+		${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/Strn/Strn.3 ${PREFIX}/man/man3
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/ftp/ncftp3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.75
\ No newline at end of property
+1.76
\ No newline at end of property