svn commit: r436258 - in head/misc/countrycodes: . files

[Emanuel Haupt]

Author: ehaupt
Date: Wed Mar 15 20:30:42 2017
New Revision: 436258
URL: https://svnweb.freebsd.org/changeset/ports/436258

Log:
  Update to 1.0.6

Added:
  head/misc/countrycodes/files/patch-Makefile   (contents, props changed)
Deleted:
  head/misc/countrycodes/files/patch-src_Makefile
Modified:
  head/misc/countrycodes/Makefile
  head/misc/countrycodes/distinfo
  head/misc/countrycodes/pkg-descr

Modified: head/misc/countrycodes/Makefile
==============================================================================
--- head/misc/countrycodes/Makefile	Wed Mar 15 20:28:53 2017	(r436257)
+++ head/misc/countrycodes/Makefile	Wed Mar 15 20:30:42 2017	(r436258)
@@ -2,28 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	countrycodes
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	misc
-MASTER_SITES=	http://www.grigna.com/diego/linux/countrycodes/ \
-		LOCAL/ehaupt
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ehaupt at FreeBSD.org
 COMMENT=	ISO 3166 country code finder
 
 LICENSE=	GPLv2
-
-BUILD_WRKSRC=	${WRKSRC}/src
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 PLIST_FILES=	bin/iso3166 man/man1/iso3166.1.gz
 PORTDOCS=	README
 
-MAKE_ARGS=	prefix="${STAGEDIR}${PREFIX}" CC="${CC}" CCOPTS="${CFLAGS}" WARNINGS=""
-
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/misc/countrycodes/distinfo
==============================================================================
--- head/misc/countrycodes/distinfo	Wed Mar 15 20:28:53 2017	(r436257)
+++ head/misc/countrycodes/distinfo	Wed Mar 15 20:30:42 2017	(r436258)
@@ -1,2 +1,3 @@
-SHA256 (countrycodes-1.0.5.tar.gz) = e56e10442c7353c39cd9e57fa747df279ae39a84a89336644a58c29de5b2b39b
-SIZE (countrycodes-1.0.5.tar.gz) = 18621
+TIMESTAMP = 1489608226
+SHA256 (countrycodes-1.0.6.tar.gz) = 4574d331b4e25f78b792fb0c10556312cca462973a9819b86c643d35ce69ed96
+SIZE (countrycodes-1.0.6.tar.gz) = 18834

Added: head/misc/countrycodes/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/countrycodes/files/patch-Makefile	Wed Mar 15 20:30:42 2017	(r436258)
@@ -0,0 +1,43 @@
+--- Makefile.orig	2017-02-26 15:02:56 UTC
++++ Makefile
+@@ -9,7 +9,7 @@
+ prefix ?= /usr/local
+ bindir ?= ${prefix}/bin
+ 
+-mandir ?= ${prefix}/man/man1
++mandir ?= ${MANPREFIX}/man/man1
+ 
+ # For system that doesn't support mkdir -p.
+ # If you have Linux, don't bother.
+@@ -23,13 +23,13 @@ BINMODE=755
+ LOGDIRMODE=700
+ 
+ # Compiler to use
+-CC=gcc
++CC?=gcc
+ 
+ # Compiler warnings
+-WARNINGS= -pedantic -Wall
++#WARNINGS= -pedantic -Wall
+ 
+ # Compiler flags
+-CCOPTS = -O2 -fomit-frame-pointer
++CCOPTS = ${CFLAGS}
+ 
+ # The makefile standards document I read says that I have to put it here...
+ SHELL = /bin/sh
+@@ -66,11 +66,11 @@ clean:
+ strip:
+ 	strip $(PROGRAM)
+ 
+-install:
+-	$(MKDIRECTORY) $(DESTDIR)/${bindir} $(DESTDIR)/${mandir}/man1
++install: strip
++	$(MKDIRECTORY) $(DESTDIR)/${bindir} $(DESTDIR)/${mandir}
+ 	$(INSTALL) -m $(BINMODE) $(PROGRAM) $(DESTDIR)/${bindir}
+ 	@echo "Installing man page..."
+-	$(INSTALL) -m 644 iso3166.1 $(DESTDIR)/${mandir}/man1
++	$(INSTALL) -m 644 iso3166.1 $(DESTDIR)/${mandir}
+ 
+ update-man:
+ 	@$(SEDBIN) $(SEDCMDS) iso3166.1.in > iso3166.1

Modified: head/misc/countrycodes/pkg-descr
==============================================================================
--- head/misc/countrycodes/pkg-descr	Wed Mar 15 20:28:53 2017	(r436257)
+++ head/misc/countrycodes/pkg-descr	Wed Mar 15 20:30:42 2017	(r436258)
@@ -2,4 +2,4 @@ Countrycodes is an ISO 3166 country code
 the country a domain name belongs to. It also allows searching by 2 or 3
 letters codes, country number and country name.
 
-WWW: http://www.grigna.com/diego/linux/countrycodes/
+WWW: https://sourceforge.net/projects/countrycodes/