Date: Wed, 19 Jun 2013 08:31:49 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Cc: jpaetzel@FreeBSD.org Subject: ports/179703: [PATCH] x11/libfm: Fix NLS, take maintainership Message-ID: <20130619063153.F065E8B5@hub.freebsd.org> Resent-Message-ID: <201306190640.r5J6e0eN037192@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179703 >Category: ports >Synopsis: [PATCH] x11/libfm: Fix NLS, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 19 06:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 >Description: - Take maintainership - Use REINPLACE_CMD instead of simple patches - Fix NLS - Trim pkg-plist Removed file(s): - files/patch-configure Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports) >How-To-Repeat: Build log https://redports.org/buildarchive/20130619054001-4518/ >Fix: --- libfm-1.1.0.patch begins here --- diff -ruN /usr/ports/x11/libfm/Makefile ./Makefile --- /usr/ports/x11/libfm/Makefile 2013-06-18 18:26:39.000000000 +0200 +++ ./Makefile 2013-06-19 07:01:22.000000000 +0200 @@ -6,7 +6,7 @@ CATEGORIES= x11 MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@gmx.ch COMMENT= The libFM backend library to PCManFM LICENSE= GPLv2 @@ -14,15 +14,16 @@ LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \ menu-cache.1:${PORTSDIR}/x11/menu-cache +USES= pkgconfig USE_GNOME= gnomehack gtk20 USE_AUTOTOOLS= libtool +CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc USE_GMAKE= yes USE_FAM= yes USE_LDCONFIG= yes -USES= pkgconfig + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc MAN1= libfm-pref-apps.1 @@ -34,18 +35,24 @@ USES+= gettext PLIST_SUB+= NLS="" .else -CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif post-patch: + @${REINPLACE_CMD} -e 's|^VALAC.*|VALAC=""|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e \ 's|-Wno-unused-but-set-variable||' \ ${WRKSRC}/src/actions/Makefile.am ${WRKSRC}/src/actions/Makefile.in +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e 's|src po|src|' \ + ${WRKSRC}/Makefile.in +.endif + pre-install: - cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh + @(cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh) .include <bsd.port.mk> diff -ruN /usr/ports/x11/libfm/files/patch-configure ./files/patch-configure --- /usr/ports/x11/libfm/files/patch-configure 2013-06-02 18:57:09.000000000 +0200 +++ ./files/patch-configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- configure.orig 2012-09-06 10:00:49.687508071 -0400 -+++ configure 2012-09-06 10:01:00.168508809 -0400 -@@ -12491,7 +12491,7 @@ - ;; - esac - fi --VALAC=$ac_cv_path_VALAC -+VALAC="" - if test -n "$VALAC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALAC" >&5 - $as_echo "$VALAC" >&6; } diff -ruN /usr/ports/x11/libfm/pkg-plist ./pkg-plist --- /usr/ports/x11/libfm/pkg-plist 2013-06-02 18:57:09.000000000 +0200 +++ ./pkg-plist 2013-06-19 07:30:34.000000000 +0200 @@ -140,19 +140,20 @@ %%NLS%%share/locale/zh_CN/LC_MESSAGES/libfm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libfm.mo share/mime/packages/libfm.xml -@dirrm etc/xdg/libfm -@dirrm etc/xdg -@dirrmtry share/locale/es_VE/LC_MESSAGES -@dirrmtry share/locale/es_VE -@dirrmtry share/locale/lg/LC_MESSAGES -@dirrmtry share/locale/lg -@dirrmtry share/locale/tt_RU/LC_MESSAGES -@dirrmtry share/locale/tt_RU -@dirrmtry share/locale/ur_PK/LC_MESSAGES -@dirrmtry share/locale/ur_PK -@dirrmtry share/applications @dirrmtry share/mime/packages @dirrmtry share/mime +@dirrm etc/xdg/libfm +@dirrm etc/xdg +%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ur_PK +%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/tt_RU +%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/lg +%%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/es_VE @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/libfm-1.0 +@dirrm include/libfm --- libfm-1.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130619063153.F065E8B5>