[Midnightbsd-cvs] mports [23783] trunk/devel/chrpath/files: update chrpath to 0.16

Sun Aug 19 13:52:12 EDT 2018

Revision: 23783
          http://svnweb.midnightbsd.org/mports/?rev=23783
Author:   laffer1
Date:     2018-08-19 13:52:11 -0400 (Sun, 19 Aug 2018)
Log Message:
-----------
update chrpath to 0.16

Modified Paths:
--------------
    trunk/devel/chrpath/Makefile
    trunk/devel/chrpath/distinfo
    trunk/devel/chrpath/files/patch-Makefile.in

Added Paths:
-----------
    trunk/devel/chrpath/files/patch-protos.h
    trunk/devel/chrpath/files/patch-testsuite__Makefile.in

Removed Paths:
-------------
    trunk/devel/chrpath/files/patch-elf.c

Property Changed:
----------------
    trunk/devel/chrpath/files/patch-Makefile.in

Modified: trunk/devel/chrpath/Makefile
===================================================================

--- trunk/devel/chrpath/Makefile	2018-08-19 17:19:19 UTC (rev 23782)
+++ trunk/devel/chrpath/Makefile	2018-08-19 17:52:11 UTC (rev 23783)
@@ -2,27 +2,31 @@
 # $FreeBSD: ports/devel/chrpath/Makefile,v 1.4 2010/09/20 17:55:49 rene Exp $
 
 PORTNAME=	chrpath
-PORTVERSION=	0.13
+PORTVERSION=	0.16
 CATEGORIES=	devel sysutils
-MASTER_SITES=	http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/
+MASTER_SITES=	DEBIAN_POOL
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Tool to modify DT_RPATH in existing ELF binaries
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		gmake
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/chrpath  man/man1/chrpath.1.gz
-
+PLIST_FILES=	bin/chrpath man/man1/chrpath.1.gz
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.	for i in ${PORTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.	endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>

Modified: trunk/devel/chrpath/distinfo
===================================================================
--- trunk/devel/chrpath/distinfo	2018-08-19 17:19:19 UTC (rev 23782)
+++ trunk/devel/chrpath/distinfo	2018-08-19 17:52:11 UTC (rev 23783)
@@ -1,3 +1,2 @@
-SHA256 (chrpath-0.13.tar.gz) = c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b
-RMD160 (chrpath-0.13.tar.gz) = 89b91919e3f629173388f10469dc94fadd46aa56
-SIZE (chrpath-0.13.tar.gz) = 125129
+SHA256 (chrpath_0.16.orig.tar.gz) = bb0d4c54bac2990e1bdf8132f2c9477ae752859d523e141e72b3b11a12c26e7b
+SIZE (chrpath_0.16.orig.tar.gz) = 134506

Modified: trunk/devel/chrpath/files/patch-Makefile.in
===================================================================
--- trunk/devel/chrpath/files/patch-Makefile.in	2018-08-19 17:19:19 UTC (rev 23782)
+++ trunk/devel/chrpath/files/patch-Makefile.in	2018-08-19 17:52:11 UTC (rev 23783)
@@ -1,27 +1,30 @@
---- Makefile.in.orig	2004-09-19 12:42:53.000000000 +0400
-+++ Makefile.in	2010-06-20 12:55:59.000000000 +0400
-@@ -66,7 +66,7 @@
- 
- SUBDIRS = testsuite deb
- 
+--- Makefile.in.orig	2014-01-12 09:03:45.000000000 +0100
++++ Makefile.in	2016-02-03 19:32:36.764942000 +0100
+@@ -243,7 +243,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(prefix)/share/doc/$(PACKAGE)
- 
- doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
- 
-@@ -263,16 +263,6 @@
- 
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -457,19 +457,6 @@
+ 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
  install-docDATA: $(doc_DATA)
  	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(docdir)
--	@list='$(doc_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
--	  fi; fi; \
+-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+-	fi; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 -	done
  
  uninstall-docDATA:


Property changes on: trunk/devel/chrpath/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/chrpath/files/patch-elf.c
===================================================================
--- trunk/devel/chrpath/files/patch-elf.c	2018-08-19 17:19:19 UTC (rev 23782)
+++ trunk/devel/chrpath/files/patch-elf.c	2018-08-19 17:52:11 UTC (rev 23783)
@@ -1,11 +0,0 @@
---- elf.c.orig	2003-12-19 21:07:00.000000000 +0000
-+++ elf.c	2009-12-01 20:39:21.000000000 +0000
-@@ -55,7 +55,7 @@
-    if (ehdr->e_phentsize != sizeof(Elf_Phdr))
-    {
-      fprintf(stderr, "section size was read as %d, not %d!\n",
--            ehdr->e_phentsize, sizeof(Elf_Phdr));
-+            ehdr->e_phentsize, (int)sizeof(Elf_Phdr));
-      close(fd);
-      return -1;
-    }

Added: trunk/devel/chrpath/files/patch-protos.h
===================================================================
--- trunk/devel/chrpath/files/patch-protos.h	                        (rev 0)
+++ trunk/devel/chrpath/files/patch-protos.h	2018-08-19 17:52:11 UTC (rev 23783)
@@ -0,0 +1,30 @@
+--- protos.h.orig	2013-11-24 08:30:01.000000000 +0100
++++ protos.h	2016-02-03 19:47:21.946096000 +0100
+@@ -1,7 +1,14 @@
+ #ifndef PROTOS_H
+ #define PROTOS_H
+ 
++#if defined __FreeBSD__ || defined __DragonFly__ || defined __MidnightBSD__
++#include <sys/endian.h>
++#define bswap_16 bswap16
++#define bswap_32 bswap32
++#define bswap_64 bswap64
++#else
+ #include <byteswap.h>
++#endif
+ #include <elf.h>
+ #include "config.h"
+ 
+@@ -14,6 +21,12 @@
+ #error "Unknown word size (SIZEOF_VOID_P)!"
+ #endif
+ 
++#if defined __FreeBSD__ || defined __DragonFly__ || defined __MidnightBSD__
++#define Elf_Ehdr Elf__Ehdr
++#define Elf_Shdr Elf__Shdr
++#define Elf_Phdr Elf__Phdr
++#endif
++
+ typedef union {
+   unsigned char e_ident[EI_NIDENT];
+   Elf32_Ehdr e32;


Property changes on: trunk/devel/chrpath/files/patch-protos.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/chrpath/files/patch-testsuite__Makefile.in
===================================================================
--- trunk/devel/chrpath/files/patch-testsuite__Makefile.in	                        (rev 0)
+++ trunk/devel/chrpath/files/patch-testsuite__Makefile.in	2018-08-19 17:52:11 UTC (rev 23783)
@@ -0,0 +1,11 @@
+--- testsuite/Makefile.in.orig	2014-01-12 09:03:45.000000000 +0100
++++ testsuite/Makefile.in	2016-02-03 19:34:07.381487000 +0100
+@@ -457,7 +457,7 @@
+ 
+ 
+ prog: prog.c
+-	$(CC) $(RPATH) -o $@ $<
++	$(CC) -Wl,$(RPATH) -o $@ $<
+ 
+ check: $(CHRPATH)
+ 	$(srcdir)/runtest.sh


Property changes on: trunk/devel/chrpath/files/patch-testsuite__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
