Bug 181889 - misc/pinfo: Update MASTER_SITES
Summary: misc/pinfo: Update MASTER_SITES
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-09-06 19:10 UTC by tkato432
Modified: 2013-11-02 20:03 UTC (History)
0 users

See Also:


Attachments
file.diff (1.44 KB, patch)
2013-09-06 19:10 UTC, tkato432
no flags Details | Diff
misc_pinfo.diff (2.12 KB, patch)
2013-11-02 17:55 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-09-06 19:10:05 UTC
- Update MASTER_SITES
- Do not include bsd.port.options.mk twice
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-09-06 19:11:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Bryan Drewery freebsd_committer freebsd_triage 2013-09-22 15:12:02 UTC
Responsible Changed
From-To: miwi->freebsd-ports-bugs

Back to the heap due to timeout
Comment 3 freebsd.contact 2013-11-01 23:45:27 UTC
I was thinking about claiming this PR, but it doesn't build anymore.
with or without these additions, pinfo fails with this now:

autopoint: *** Missing version: please specify in configure.ac through a
line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package
is using autopoint: *** Stop.
*** Error code 1

As a side note, the patch no longer applies cleanly due to the
NO_STAGE=yes line that was added.

John
Comment 4 tkato432 2013-11-02 17:55:10 UTC
Remake of the patch against current tree.
Comment 5 John Marino freebsd_committer freebsd_triage 2013-11-02 19:37:02 UTC
Responsible Changed
From-To: freebsd-ports-bugs->marino

I'll take it.
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-11-02 19:57:20 UTC
Author: marino
Date: Sat Nov  2 19:57:11 2013
New Revision: 332536
URL: http://svnweb.freebsd.org/changeset/ports/332536

Log:
  misc/pinfo: Unbreak everywhere
  
  Fix tested on DragonFly, and FreeBSD 8, 9, 10 (Redports).
  As a bonus, it even supports stage!  Nice work.
  
  PR:		ports/181889
  Submitted by:	KATO Tsuguru

Modified:
  head/misc/pinfo/Makefile

Modified: head/misc/pinfo/Makefile
==============================================================================
--- head/misc/pinfo/Makefile	Sat Nov  2 19:55:49 2013	(r332535)
+++ head/misc/pinfo/Makefile	Sat Nov  2 19:57:11 2013	(r332536)
@@ -4,55 +4,54 @@
 PORTNAME=	pinfo
 PORTVERSION=	0.6.10
 CATEGORIES=	misc
-MASTER_SITES=   http://spout.ussg.indiana.edu/linux/gentoo/distfiles/ \
-		http://ftp.yellowdoglinux.com/.2/gentoo/distfiles/
+MASTER_SITES=	GENTOO/distfiles \
+		http://alioth.debian.org/frs/download.php/file/3351/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ncurses based, lynx style info documentation browser
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	READLINE
+OPTIONS_DEFINE=	READLINE NLS
 OPTIONS_DEFAULT=READLINE
 
 USE_BZIP2=	yes
-USES=		ncurses gettext
+USES=		ncurses
 USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
 LIBTOOLIZE_ARGS=--force
 ACLOCAL_ARGS=	-I macros
 AUTOMAKE_ARGS=	--add-missing --force-missing
 CONFIGURE_ARGS=	--with-localedir=${PREFIX}/share/locale
 
+CFLAGS+=	-DHAVE_LOCALE_H
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		pinfo.1
 INFO=		pinfo
+PLIST_FILES=	bin/pinfo etc/pinforc man/man1/pinfo.1.gz
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-PLIST_FILES=	bin/pinfo etc/pinforc
-.for lang in cs de eu ja nl pl pt_BR ro ru sv vi
-PLIST_FILES+=	%%NLS%%share/locale/${lang}/LC_MESSAGES/pinfo.mo
-.endfor
+READLINE_USES=	readline
+READLINE_CONFIGURE_WITH=	readline
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
+USES+=		gettext
+.for lang in cs de eu ja nl pl pt_BR ro ru sv vi
+PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/pinfo.mo
+.endfor
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
+USES+=		gettext:build
+CONFIGURE_ARGS+=--disable-nls
 .endif
 
-.if ${PORT_OPTIONS:MREADLINE}
-USES+=		readline
-.else
-CONFIGURE_ARGS+=--without-readline
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|@MKINSTALLDIRS@|$$(top_srcdir)/tools/install-sh -d|' \
+		${WRKSRC}/po/Makefile.in.in
 
 pre-configure:
-	@(cd ${WRKSRC} && ${LOCALBASE}/bin/autopoint)
+	@${MKDIR} ${WRKSRC}/tools
+	@${LN} -sf ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC}/tools
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 John Marino freebsd_committer freebsd_triage 2013-11-02 20:03:45 UTC
State Changed
From-To: open->closed

Committed. Thanks!