Date: Tue, 16 Apr 2013 23:13:51 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315918 - in head/deskutils: xpad xpad-current Message-ID: <201304162313.r3GNDpEV047650@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Tue Apr 16 23:13:51 2013 New Revision: 315918 URL: http://svnweb.freebsd.org/changeset/ports/315918 Log: - support handling of NLS while upstream works out issue - bump portrevision Feature safe: yes Modified: head/deskutils/xpad-current/Makefile head/deskutils/xpad-current/pkg-plist head/deskutils/xpad/Makefile head/deskutils/xpad/pkg-plist Modified: head/deskutils/xpad-current/Makefile ============================================================================== --- head/deskutils/xpad-current/Makefile Tue Apr 16 22:59:51 2013 (r315917) +++ head/deskutils/xpad-current/Makefile Tue Apr 16 23:13:51 2013 (r315918) @@ -3,7 +3,7 @@ PORTNAME= xpad PORTVERSION= 4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ PKGNAMESUFFIX= -current @@ -13,6 +13,8 @@ COMMENT= Virtual note-pad system for you LICENSE= GPLv3 +OPTIONS_DEFINE= NLS + CONFLICTS_INSTALL= xpad-[0-9]* FETCH_ARGS= -p USE_BZIP2= yes @@ -25,12 +27,24 @@ LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_GMAKE= yes +.include <bsd.port.options.mk> + #code currently doesn't properly handle --disable-nls (in next upstream milestone) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes - -MAN1= xpad.1 - -post-patch: +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " +.endif + +MAN1+= xpad.1 + +post-patch-script: +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e 's|SUBDIRS = autopackage doc src images po|SUBDIRS = autopackage doc src images|' \ + ${WRKSRC}/Makefile.in +.endif @${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \ ${WRKSRC}/src/xpad-undo.c Modified: head/deskutils/xpad-current/pkg-plist ============================================================================== --- head/deskutils/xpad-current/pkg-plist Tue Apr 16 22:59:51 2013 (r315917) +++ head/deskutils/xpad-current/pkg-plist Tue Apr 16 23:13:51 2013 (r315918) @@ -1,32 +1,32 @@ bin/xpad share/applications/xpad.desktop share/icons/hicolor/scalable/apps/xpad.svg -share/locale/af/LC_MESSAGES/xpad.mo -share/locale/bg/LC_MESSAGES/xpad.mo -share/locale/cs/LC_MESSAGES/xpad.mo -share/locale/da/LC_MESSAGES/xpad.mo -share/locale/de/LC_MESSAGES/xpad.mo -share/locale/en_GB/LC_MESSAGES/xpad.mo -share/locale/es/LC_MESSAGES/xpad.mo -share/locale/et/LC_MESSAGES/xpad.mo -share/locale/fi/LC_MESSAGES/xpad.mo -share/locale/fr/LC_MESSAGES/xpad.mo -share/locale/ga/LC_MESSAGES/xpad.mo -share/locale/hr/LC_MESSAGES/xpad.mo -share/locale/hu/LC_MESSAGES/xpad.mo -share/locale/it/LC_MESSAGES/xpad.mo -share/locale/ja/LC_MESSAGES/xpad.mo -share/locale/ko/LC_MESSAGES/xpad.mo -share/locale/lv/LC_MESSAGES/xpad.mo -share/locale/nl/LC_MESSAGES/xpad.mo -share/locale/pt/LC_MESSAGES/xpad.mo -share/locale/ro/LC_MESSAGES/xpad.mo -share/locale/ru/LC_MESSAGES/xpad.mo -share/locale/rw/LC_MESSAGES/xpad.mo -share/locale/sv/LC_MESSAGES/xpad.mo -share/locale/th/LC_MESSAGES/xpad.mo -share/locale/tr/LC_MESSAGES/xpad.mo -share/locale/vi/LC_MESSAGES/xpad.mo -share/locale/zh_CN/LC_MESSAGES/xpad.mo -share/locale/zh_TW/LC_MESSAGES/xpad.mo +%%NLS%%%%NLS%%share/locale/af/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/da/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/de/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/es/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/et/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/fi/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/fr/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ga/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/hr/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/hu/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/it/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ja/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ko/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/lv/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/nl/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/pt/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ro/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ru/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/rw/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/sv/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/th/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/tr/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/vi/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/xpad.mo @dirrmtry share/applications Modified: head/deskutils/xpad/Makefile ============================================================================== --- head/deskutils/xpad/Makefile Tue Apr 16 22:59:51 2013 (r315917) +++ head/deskutils/xpad/Makefile Tue Apr 16 23:13:51 2013 (r315918) @@ -1,9 +1,9 @@ -# Created by: Guillaume Paquet <amyfoub@gmail.com> +# Created by: Guillaume Paquet <amyfoub@gmail.com> # $FreeBSD$ PORTNAME= xpad PORTVERSION= 3.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils MASTER_SITES= http://launchpad.net/xpad/stable/${PORTVERSION}/+download/ @@ -12,6 +12,8 @@ COMMENT= Virtual note-pad system for you LICENSE= GPLv3 +OPTIONS_DEFINE= NLS + CONFLICTS_INSTALL= xpad-current-[0-9]* FETCH_ARGS= "-pRr" @@ -22,11 +24,27 @@ USE_GNOME= gtk20 gnomehier intltool USE_PKGCONFIG= build INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -USE_GETTEXT= yes MAN1= xpad.1 +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " +.endif + +MAN1+= xpad.1 + +post-patch-script: +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e 's|SUBDIRS = autopackage doc src images po|SUBDIRS = autopackage doc src images|' \ + ${WRKSRC}/Makefile.in +.endif + .include <bsd.port.mk> Modified: head/deskutils/xpad/pkg-plist ============================================================================== --- head/deskutils/xpad/pkg-plist Tue Apr 16 22:59:51 2013 (r315917) +++ head/deskutils/xpad/pkg-plist Tue Apr 16 23:13:51 2013 (r315918) @@ -1,28 +1,28 @@ bin/xpad share/applications/xpad.desktop share/icons/hicolor/scalable/apps/xpad.svg -share/locale/af/LC_MESSAGES/xpad.mo -share/locale/bg/LC_MESSAGES/xpad.mo -share/locale/cs/LC_MESSAGES/xpad.mo -share/locale/da/LC_MESSAGES/xpad.mo -share/locale/en_GB/LC_MESSAGES/xpad.mo -share/locale/es/LC_MESSAGES/xpad.mo -share/locale/fi/LC_MESSAGES/xpad.mo -share/locale/fr/LC_MESSAGES/xpad.mo -share/locale/ga/LC_MESSAGES/xpad.mo -share/locale/hu/LC_MESSAGES/xpad.mo -share/locale/it/LC_MESSAGES/xpad.mo -share/locale/ja/LC_MESSAGES/xpad.mo -share/locale/ko/LC_MESSAGES/xpad.mo -share/locale/lv/LC_MESSAGES/xpad.mo -share/locale/nl/LC_MESSAGES/xpad.mo -share/locale/ro/LC_MESSAGES/xpad.mo -share/locale/ru/LC_MESSAGES/xpad.mo -share/locale/rw/LC_MESSAGES/xpad.mo -share/locale/sv/LC_MESSAGES/xpad.mo -share/locale/vi/LC_MESSAGES/xpad.mo -share/locale/zh_CN/LC_MESSAGES/xpad.mo -share/locale/zh_TW/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/af/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/da/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/es/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/fi/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/fr/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ga/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/hu/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/it/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ja/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ko/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/lv/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/nl/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ro/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/ru/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/rw/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/sv/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/vi/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/xpad.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/xpad.mo @dirrmtry share/applications -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw +@dirrmtry %%NLS%%share/locale/rw/LC_MESSAGES +@dirrmtry %%NLS%%share/locale/rw
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304162313.r3GNDpEV047650>