From 3b078096e7ac754ce4583c9b0c5e08f01179aa42 Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Sat, 30 Aug 2014 14:56:17 +0000
Subject: - Update to 1.1.24+nmu3.  DL paper size specification is fixed. - Use
 install-strip. - Add LICENSE.

---
 print/libpaper/Makefile                    | 30 +++++++++++++-----------------
 print/libpaper/distinfo                    |  4 ++--
 print/libpaper/files/patch-lib-Makefile.in | 10 +++++-----
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 54a6e42836ad..96934ca3a9e1 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -2,38 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	libpaper
-PORTVERSION=	1.1.24
-PORTREVISION=	2
+PORTVERSION=	1.1.24.3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/libp/libpaper
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION:C/.([0-9]+)$/+nmu\1/}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Library providing routines for paper size management
 
+LICENSE=	GPLv2
+
 USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.([0-9]+)$/+nmu\1/}
+INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-pre-configure:
-	@${TOUCH} ${WRKSRC}/config.sub
-	@${REINPLACE_CMD} -E -e 's|(#!).*/bin/bash|\1/bin/sh|g' \
-			-e 's|==|=|g' \
-		${WRKSRC}/src/paperconfig.in
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|g' ${WRKSRC}/config.h \
-			${WRKSRC}/src/paperconfig
-
-pre-build:
+post-extract:
 	${ECHO_CMD} a4 > ${WRKDIR}/papersize.a4
 	${ECHO_CMD} letter > ${WRKDIR}/papersize.letter
 
+post-configure:
+	@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|g' \
+	    ${WRKSRC}/config.h ${WRKSRC}/src/paperconfig
+
 post-install:
 	cd ${WRKDIR} && \
-		${INSTALL_DATA} papersize.a4 papersize.letter ${STAGEDIR}${PREFIX}/etc
+	    ${INSTALL_DATA} papersize.a4 papersize.letter \
+	    ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/print/libpaper/distinfo b/print/libpaper/distinfo
index 5834f31c0617..83089da4f300 100644
--- a/print/libpaper/distinfo
+++ b/print/libpaper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpaper_1.1.24.tar.gz) = 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e
-SIZE (libpaper_1.1.24.tar.gz) = 355272
+SHA256 (libpaper_1.1.24+nmu3.tar.gz) = 1ee1ff0792d81f080c6f8b65509170448e14bf29e1af8223f8e58d55bd11cea5
+SIZE (libpaper_1.1.24+nmu3.tar.gz) = 369414
diff --git a/print/libpaper/files/patch-lib-Makefile.in b/print/libpaper/files/patch-lib-Makefile.in
index 1eb9e0953d45..62938406d726 100644
--- a/print/libpaper/files/patch-lib-Makefile.in
+++ b/print/libpaper/files/patch-lib-Makefile.in
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Mon Apr  9 10:45:45 2007
-+++ lib/Makefile.in	Mon Apr  9 10:49:48 2007
-@@ -500,14 +500,14 @@
+--- lib/Makefile.in.orig	2014-04-10 22:56:38.000000000 +0900
++++ lib/Makefile.in	2014-08-30 23:40:33.000000000 +0900
+@@ -678,14 +678,14 @@
  
  
  paperspecs.h: paperspecs Makefile
@@ -13,7 +13,7 @@
  	       if ($$4 == "in") factor = 72.0; \
  	       printf("    { \"%s\", %5f, %5f },\n", \
 -		      $$1, $$2 * factor, $$3 * factor); }' < $< >> $@
-+		      $$1, $$2 * factor, $$3 * factor); }' < $< paperspecs >> $@
++		      $$1, $$2 * factor, $$3 * factor); }' < paperspecs >> $@
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-- 
cgit