Update to 0.7.7.1

5 files changed, 47 insertions, 62 deletions

diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 43de38c..d9aeb76 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -8,36 +8,35 @@
 PORTNAME=	linm
 PORTVERSION=	${LINM_VER}.1
 CATEGORIES=	misc shells
-MASTER_SITES=	http://kldp.net/frs/download.php/3116/ \
-		ftp://ftp.kr.freebsd.org/pub/kldp.net/download/mls/1.LinMUnstable/LinM${LINM_VER}/
+MASTER_SITES=	http://kldp.net/frs/download.php/3152/ \
+		ftp://ftp.kr.freebsd.org/pub/kldp.net/download/mls/1.LinMStable/LinM${LINM_VER}/
 DISTNAME=	linm_${LINM_VER}-1
 
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Clone of Mdir, mc-style terminal file manager
 
+LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-USE_ICONV=	yes
 USE_OPENSSL=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=  CPPFLAGS=-I${LOCALBASE}/include
-
 # does not work now
 #.if defined(WITHOUT_NLS)
 #CONFIGURE_ARGS+=--disable-nls
 #PLIST_SUB+=	NLS="@comment "
 #.else
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl -liconv"
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 #.endif
 
-LINM_VER=	0.7.6
-WRKSRC=		${WRKDIR}/linm-${LINM_VER}
+CONFIGURE_ARGS+= --enable-cfgpath="${PREFIX}/etc/linm" --enable-kolocalepath="${PREFIX}/share/locale/ko/LC_MESSAGES"
 
-post-patch:
-	@${REINPLACE_CMD} -e "s:/etc/linm:${PREFIX}/etc/linm:" "${WRKSRC}/src/ncurses/main_ncurces.cpp"
+LINM_VER=	0.7.7
+WRKSRC=		${WRKDIR}/linm-${LINM_VER}
 
 post-install:
 .if !defined (NOPORTDOCS)
diff --git a/misc/linm/distinfo b/misc/linm/distinfo
index 281f491..bb6bb21 100644
--- a/misc/linm/distinfo
+++ b/misc/linm/distinfo
@@ -1,3 +1,3 @@
-MD5 (linm_0.7.6-1.tar.gz) = 52ced032352820a7f0df7e3a89394273
-SHA256 (linm_0.7.6-1.tar.gz) = 213be2aaec1290e439225db1a45d63113ca90b4ba68c25f05b7fb3219fa0744f
-SIZE (linm_0.7.6-1.tar.gz) = 664750
+MD5 (linm_0.7.7-1.tar.gz) = 0f6568928d147b00bac32a3a79fe4607
+SHA256 (linm_0.7.7-1.tar.gz) = e09e8aca1f31dbd2d191de90214c569e248a791c4341296756ed2eeb6657e656
+SIZE (linm_0.7.7-1.tar.gz) = 670100
diff --git a/misc/linm/files/patch-Makefile.in b/misc/linm/files/patch-Makefile.in
index 2f19c0a..6d8dae1 100644
--- a/misc/linm/files/patch-Makefile.in
+++ b/misc/linm/files/patch-Makefile.in
@@ -1,50 +1,18 @@
---- Makefile.in.bak	Tue Jan 24 11:36:21 2006
-+++ Makefile.in	Tue Jan 24 11:40:17 2006
-@@ -657,18 +657,13 @@
- 
- install-exec-hook :
- 	if test "x$(DESTDIR)" != x; then \
--		install -d -m 755 $(DESTDIR)/etc/linm && \
--		install -d -m 755 $(DESTDIR)/usr/share/locale/ko/LC_MESSAGES && \
--		install -d -m 755 $(DESTDIR)/etc/profile.d \
-+		install -d -m 755 $(DESTDIR)/$(sysconfdir)/linm && \
-+		install -d -m 755 $(DESTDIR)/$(datadir)/locale/ko/LC_MESSAGES \
- 	; fi
- 
--	if test -w $(DESTDIR)/etc/profile.d ; then \
--		install -c -m 755 $(top_srcdir)/sh/linm_alias.sh $(DESTDIR)/etc/profile.d \
--	; fi
--
--	if ! test -d $(DESTDIR)/etc/linm ; then \
--		if test -w $(DESTDIR)/etc ; then \
--			mkdir $(DESTDIR)/etc/linm \
-+	if ! test -d $(DESTDIR)/$(sysconfdir)/linm ; then \
-+		if test -w $(DESTDIR)/$(sysconfdir) ; then \
-+			mkdir $(DESTDIR)/$(sysconfdir)/linm \
- 		; fi \
- 	; fi 
- 
-@@ -676,20 +671,12 @@
- 		install -c -m 644 $(top_srcdir)/sh/default.cfg \
+--- Makefile.in.orig	Tue Jan 31 01:14:27 2006
++++ Makefile.in	Thu Feb 16 15:16:59 2006
+@@ -673,15 +673,7 @@
  					$(top_srcdir)/sh/colorset.cfg \
  					$(top_srcdir)/sh/keyset.cfg \
--					$(DESTDIR)/etc/linm \
+ 					$(DESTDIR)$(LINM_CFGPATH) \
 -	; else \
 -		if ! test -d ~/.linm ; then \
--			mkdir ~/.linm \
+-			install -d -m 755 ~/.linm \
 -		; fi && \
 -		install -c -m 644 $(top_srcdir)/sh/default.cfg \
 -					$(top_srcdir)/sh/colorset.cfg \
 -					$(top_srcdir)/sh/keyset.cfg \
 -					~/.linm \
-+					$(DESTDIR)/$(sysconfdir)/linm \
- 	; fi
- 
--	if test -w $(DESTDIR)/usr/share/locale/ko/LC_MESSAGES; then \
-+	if test -w $(DESTDIR)/$(datadir)/locale/ko/LC_MESSAGES; then \
- 		install -c -m 644	$(top_srcdir)/locale/linm_euckr.mo $(top_srcdir)/locale/linm_utf8.mo \
--				$(DESTDIR)/usr/share/locale/ko/LC_MESSAGES \
-+				$(DESTDIR)/$(datadir)/locale/ko/LC_MESSAGES \
- 	; fi
+	; fi
  
- uninstall-hook :
+ 	if ! test -d $(DESTDIR)$(KO_LOCALE_FILEPATH) ; then \
+ 		install -d -m 755 $(DESTDIR)$(KO_LOCALE_FILEPATH) \
diff --git a/misc/linm/files/patch-configure b/misc/linm/files/patch-configure
new file mode 100644
index 0000000..8b55f81
--- /dev/null
+++ b/misc/linm/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	Thu Feb 16 15:55:08 2006
++++ configure	Thu Feb 16 15:56:04 2006
+@@ -29097,9 +29097,9 @@
+ fi
+ 
+ 
+-# Check whether --enable-configpath or --disable-configpath was given.
+-if test "${enable_configpath+set}" = set; then
+-  enableval="$enable_configpath"
++# Check whether --enable-cfgpath or --disable-cfgpath was given.
++if test "${enable_cfgpath+set}" = set; then
++  enableval="$enable_cfgpath"
+   enable_cfgpath=${enableval}
+ else
+   enable_cfgpath=default
+@@ -29125,9 +29125,9 @@
+ 
+ 
+ 
+-# Check whether --enable-configpath or --disable-configpath was given.
+-if test "${enable_configpath+set}" = set; then
+-  enableval="$enable_configpath"
++# Check whether --enable-kolocalepath or --disable-kolocalepath was given.
++if test "${enable_kolocalepath+set}" = set; then
++  enableval="$enable_kolocalepath"
+   enable_kolocalepath=${enableval}
+ else
+   enable_kolocalepath=default
diff --git a/misc/linm/files/patch-lib::define.h b/misc/linm/files/patch-lib::define.h
deleted file mode 100644
index 280f1a5..0000000
--- a/misc/linm/files/patch-lib::define.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/define.h~	Sat Jan 14 20:55:18 2006
-+++ lib/define.h	Tue Jan 24 11:16:05 2006
-@@ -39,6 +39,7 @@
- 	# endif
- 	
- 	#ifdef HAVE_GETTEXT
-+		#include <libintl.h>
- 		#define _(Text)	gettext(Text)
- 	#else
- 		#define _(Text)	Text