Attachment 134525 Details for Bug 179211 – file.diff

[patch] file.diff

file.diff (text/plain), 6.82 KB, created by tkato432 on 2013-06-02 19:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-06-02 19:10:01 UTC

Size: 6.82 KB

patch

obsolete

>diff -urN /usr/ports/misc/linm/Makefile misc/linm/Makefile
>--- /usr/ports/misc/linm/Makefile	2013-04-27 22:32:41.000000000 +0900
>+++ misc/linm/Makefile	2013-06-03 00:00:00.000000000 +0900
>@@ -2,49 +2,53 @@
> # $FreeBSD: head/misc/linm/Makefile 316662 2013-04-27 11:59:28Z mva $
> 
> PORTNAME=	linm
>-PORTVERSION=	${LINM_VER}.1
>-PORTREVISION=	3
>+DISTVERSION=	0.8.1-1
> CATEGORIES=	misc shells
>-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
>+MASTER_SITES=	http://kldp.net/frs/download.php/4508/
>+DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Clone of Mdir, mc-style terminal file manager
> 
>-USES=		pkgconfig iconv
>-USE_AUTOTOOLS=	libtool
>+LICENSE=	GPLv2 # (or later)
>+
>+OPTIONS_DEFINE=	SMB
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*//}
>+
>+USES=		gettext pkgconfig
> USE_OPENSSL=	yes
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>+USE_AUTOTOOLS=	libtool
>+CONFIGURE_ARGS=	--enable-cfgpath="${ETCDIR}"
>+MAKE_JOBS_UNSAFE=	yes
> 
> 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 -liconv"
>-USES+=		gettext
>-PLIST_SUB+=	NLS=""
>-#.endif
>-
>-CONFIGURE_ARGS+=	--enable-cfgpath="${PREFIX}/etc/linm" --enable-kolocalepath="${PREFIX}/share/locale/ko/LC_MESSAGES"
>-
>-LINM_VER=	0.7.7
>-WRKSRC=		${WRKDIR}/linm-${LINM_VER}
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MSMB}
>+LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
>+PLIST_SUB+=	SMB=""
>+.else
>+CONFIGURE_ENV+=	ac_cv_lib_smbclient_smbc_new_context=no
>+PLIST_SUB+=	SMB="@comment "
>+.endif
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's|Panel::SetCur|SetCur|' ${WRKSRC}/panel/common/panel.h
>-	@${REINPLACE_CMD} -e 's|Position::Show|Show|' ${WRKSRC}/src/ncurses/dialog.h
>+	@${REINPLACE_CMD} -e \
>+		's|configpath|cfgpath|g ; \
>+		 /LIBS=/s|-lpthread|-pthread|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		'/^AM_CFLAGS/s|=.*|= -fPIC -std=gnu89|' \
>+		${WRKSRC}/panel/vfs/libssh2/Makefile.in
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${PREFIX}/share/doc/linm
>-.for file in AUTHORS COPYING ChangeLog README README.ko_euckr README.ko_utf8
>-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>+	@${MKDIR} ${DOCSDIR}
>+.for i in AUTHORS ChangeLog README README.ko_euckr README.ko_utf8
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
> .endfor
> .endif
> 
>diff -urN /usr/ports/misc/linm/distinfo misc/linm/distinfo
>--- /usr/ports/misc/linm/distinfo	2012-11-08 09:15:00.000000000 +0900
>+++ misc/linm/distinfo	2013-06-03 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (linm_0.7.7-1.tar.gz) = e09e8aca1f31dbd2d191de90214c569e248a791c4341296756ed2eeb6657e656
>-SIZE (linm_0.7.7-1.tar.gz) = 670100
>+SHA256 (linm_0.8.1-1.tar.gz) = 18f7a99059e3d741f6300078a946ecb55a6bc7014b12c0178819434e38892d97
>+SIZE (linm_0.8.1-1.tar.gz) = 947761
>diff -urN /usr/ports/misc/linm/files/patch-Makefile.in misc/linm/files/patch-Makefile.in
>--- /usr/ports/misc/linm/files/patch-Makefile.in	2012-11-08 09:15:00.000000000 +0900
>+++ misc/linm/files/patch-Makefile.in	2013-06-03 00:00:00.000000000 +0900
>@@ -1,6 +1,26 @@
> --- Makefile.in.orig	Tue Jan 31 01:14:27 2006
> +++ Makefile.in	Thu Feb 16 15:16:59 2006
>-@@ -673,15 +673,7 @@
>+@@ -239,7 +239,7 @@
>+ # have all needed files, that a GNU package needs
>+ AUTOMAKE_OPTIONS = foreign 1.4
>+ ACLOCAL_AMFLAGS = -I m4
>+-SUBDIRS = intl po lib panel editor src sh
>++SUBDIRS = po lib panel editor src sh
>+ noinst_DATA = README.ko_euckr README.ko_utf8 linm.spec debian/*
>+ EXTRA_DIST = config.rpath m4/ChangeLog  $(noinst_DATA)
>+ all: config.h
>+@@ -695,6 +695,10 @@
>+ 
>+ 
>+ install-exec-hook :
>++	if ! test -d $(DESTDIR)$(sysconfdir)/profile.d ; then \
>++		install -d -m 755 $(DESTDIR)$(sysconfdir)/profile.d \
>++	; fi
>++
>+ 	if test -d $(DESTDIR)$(sysconfdir)/profile.d ; then \
>+ 		if test -w $(DESTDIR)$(sysconfdir)/profile.d ; then \
>+ 			install -c -m 755 $(top_srcdir)/sh/linm_alias.sh $(DESTDIR)$(sysconfdir)/profile.d \
>+@@ -710,14 +714,6 @@
>  					$(top_srcdir)/sh/colorset.cfg \
>  					$(top_srcdir)/sh/keyset.cfg \
>  					$(DESTDIR)$(LINM_CFGPATH) \
>@@ -12,7 +32,6 @@
> -					$(top_srcdir)/sh/colorset.cfg \
> -					$(top_srcdir)/sh/keyset.cfg \
> -					~/.linm \
>-	; fi
>+ 	; fi
>  
>- 	if ! test -d $(DESTDIR)$(KO_LOCALE_FILEPATH) ; then \
>- 		install -d -m 755 $(DESTDIR)$(KO_LOCALE_FILEPATH) \
>+ 	if ! test -d $(DESTDIR)$(datadir)/pixmaps ; then \
>diff -urN /usr/ports/misc/linm/files/patch-configure misc/linm/files/patch-configure
>--- /usr/ports/misc/linm/files/patch-configure	2012-11-08 09:15:00.000000000 +0900
>+++ misc/linm/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,28 +0,0 @@
>---- 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 -urN /usr/ports/misc/linm/pkg-plist misc/linm/pkg-plist
>--- /usr/ports/misc/linm/pkg-plist	2012-11-08 09:15:01.000000000 +0900
>+++ misc/linm/pkg-plist	2013-06-03 00:00:00.000000000 +0900
>@@ -2,10 +2,10 @@
> bin/linm
> bin/linm.csh
> bin/linm.sh
>-etc/linm/colorset.cfg
>-etc/linm/default.cfg
>-etc/linm/keyset.cfg
>-@dirrm etc/linm
>+%%ETCDIR%%/colorset.cfg
>+%%ETCDIR%%/default.cfg
>+%%ETCDIR%%/keyset.cfg
>+etc/profile.d/linm_alias.sh
> lib/liblinmpluginarc.a
> lib/liblinmpluginarc.la
> lib/liblinmpluginarc.so
>@@ -18,12 +18,18 @@
> lib/liblinmpluginsftp.la
> lib/liblinmpluginsftp.so
> lib/liblinmpluginsftp.so.0
>+%%SMB%%lib/liblinmpluginsmb.a
>+%%SMB%%lib/liblinmpluginsmb.la
>+%%SMB%%lib/liblinmpluginsmb.so
>+%%SMB%%lib/liblinmpluginsmb.so.0
>+share/applications/LinM.desktop
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/README.ko_euckr
> %%PORTDOCS%%%%DOCSDIR%%/README.ko_utf8
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>-%%NLS%%share/locale/ko/LC_MESSAGES/linm_euckr.mo
>-%%NLS%%share/locale/ko/LC_MESSAGES/linm_utf8.mo
>+share/locale/ko/LC_MESSAGES/linm.mo
>+share/pixmaps/linm.xpm
>+@dirrmtry share/applications
>+@dirrmtry etc/profile.d
>+@dirrm %%ETCDIR%%

Actions: View | Diff

Attachments on bug 179211: 134525 | 134526