3 files changed, 9 insertions, 76 deletions

diff --git a/converters/ascii2binary/Makefile b/converters/ascii2binary/Makefile
index 66ff43f3a6a9..bc8d31cd3ff7 100644
--- a/converters/ascii2binary/Makefile
+++ b/converters/ascii2binary/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ascii2binary
-PORTVERSION=	2.8.1
+PORTVERSION=	2.9
 CATEGORIES=	converters
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 DISTNAME=	${PORTNAME}
@@ -16,33 +16,15 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Convert between textual representations of numbers and binary
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"		\
-		LIBS="-lintl"
-MAKE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"		\
-		LIBS="-lintl"
-USE_GETTEXT=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST_FILES=	bin/ascii2binary bin/binary2ascii		\
-		%%NLS%%share/locale/fr/LC_MESSAGES/ascii2binary.mo
+PLIST_FILES=	bin/ascii2binary bin/binary2ascii
 
 MAN1=		ascii2binary.1 binary2ascii.1
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB=	NLS="@comment "
-.else
-PLIST_SUB=	NLS=""
-.endif
-
 pre-configure:
-.if defined(WITHOUT_NLS)
-	${REINPLACE_CMD} -e 's|cp -r locale|#cp -r locale|' ${WRKSRC}/Makefile
-.endif
-
-post-install:
-	@${FIND} ${PREFIX}/share/locale -name ascii2binary.po -delete
+	${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/converters/ascii2binary/distinfo b/converters/ascii2binary/distinfo
index 3e06686236b4..d0276905c4bf 100644
--- a/converters/ascii2binary/distinfo
+++ b/converters/ascii2binary/distinfo
@@ -1,3 +1,3 @@
-MD5 (ascii2binary-2.8.1/ascii2binary.tgz) = f15f907641203950213f48a43e2d4f45
-SHA256 (ascii2binary-2.8.1/ascii2binary.tgz) = e50c61237fb0c42859d40155ac37c4a93eb6ca053c0c6df6c74d24704af98a59
-SIZE (ascii2binary-2.8.1/ascii2binary.tgz) = 61894
+MD5 (ascii2binary-2.9/ascii2binary.tgz) = 578b0c41f9a23d5083bcd776be67646e
+SHA256 (ascii2binary-2.9/ascii2binary.tgz) = 2241c7fb711b360f5c6914f3b6169f4636d5e8a5050fae7257aad2483d6af2c0
+SIZE (ascii2binary-2.9/ascii2binary.tgz) = 97641
diff --git a/converters/ascii2binary/files/patch-Makefile b/converters/ascii2binary/files/patch-Makefile
deleted file mode 100644
index ef22206e6959..000000000000
--- a/converters/ascii2binary/files/patch-Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.orig	Mon Sep 12 19:35:10 2005
-+++ Makefile	Mon Jan 30 00:09:11 2006
-@@ -1,28 +1,27 @@
--CC=gcc 
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/man1
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man/man1
- BINS=   ascii2binary binary2ascii
- MANS=   ascii2binary.1 binary2ascii.1
--LOCALEDIR=/usr/local/share/locale
--CFLAGS= -DPACKAGE=\"ascii2binary\" -DLOCALEDIR=\"${LOCALEDIR}\"
-+LOCALEDIR=${PREFIX}/share/locale
-+CFLAGS= ${CPPFLAGS} -DPACKAGE=\"ascii2binary\" -DLOCALEDIR=\"${LOCALEDIR}\"
- all:	${BINS} mo
- #CFLAGS= -DPACKAGE=\"ascii2binary\" -DLOCALEDIR=\"${LOCALEDIR}\"
- #all:	${BINS}
- 
- ascii2binary:	ascii2binary.o GetWord.o MachineInfo.o endian.o exitcodes.o
--		${CC} -o ascii2binary ascii2binary.o GetWord.o MachineInfo.o endian.o exitcodes.o
-+		${CC} ${LDFLAGS} -o ascii2binary ascii2binary.o GetWord.o MachineInfo.o endian.o exitcodes.o ${LIBS}
- 
- binary2ascii:	binary2ascii.o binfmt.o MachineInfo.o endian.o exitcodes.o
--		${CC} -o binary2ascii binary2ascii.o binfmt.o MachineInfo.o endian.o exitcodes.o
-+		${CC} ${LDFLAGS} -o binary2ascii binary2ascii.o binfmt.o MachineInfo.o endian.o exitcodes.o ${LIBS}
- 
- MachineInfo.o:	MachineInfo.c
--		${CC} -c MachineInfo.c
-+		${CC} -c ${CFLAGS} MachineInfo.c
- 
- GetWord.o:	GetWord.c
--		${CC} -c GetWord.c
-+		${CC} -c ${CFLAGS} GetWord.c
- 
- binfmt.o:	binfmt.c
--		${CC} -c binfmt.c
-+		${CC} -c ${CFLAGS} binfmt.c
- 
- exitcodes.o:	exitcodes.c
- 		${CC} -c ${CFLAGS} exitcodes.c
-@@ -33,7 +32,7 @@
- binary2ascii.o:	binary2ascii.c
- 		${CC} ${CFLAGS} -c binary2ascii.c
- 
--mo:		
-+mo:
- 		(cd locale/fr/LC_MESSAGES; make ascii2binary.mo)
- 
- install:	${BINS} ${MANS}