Bug 167636 - [PATCH] textproc/expat2: update to 2.1.0
Summary: [PATCH] textproc/expat2: update to 2.1.0
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: Jun Kuriyama
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-05-06 09:30 UTC by Po-Chuan Hsieh
Modified: 2013-07-31 20:37 UTC (History)
1 user (show)

See Also:


Attachments
expat-2.1.0.patch (3.64 KB, patch)
2012-05-06 09:30 UTC, Po-Chuan Hsieh
no flags Details | Diff
expat.patch (4.69 KB, patch)
2013-07-07 13:47 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Po-Chuan Hsieh freebsd_committer freebsd_triage 2012-05-06 09:30:10 UTC
- Update to 2.1.0

Removed file(s):
- files/patch-Makefile.in
- files/patch-xmlparse.c
- files/patch-xmltok_impl.c

Note that shlib version changed from 6 to 7.

Port maintainer (kuriyama@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: CVS)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-05-06 09:30:22 UTC
Responsible Changed
From-To: freebsd-ports-bugs->kuriyama

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Tijl Coosemans freebsd_committer freebsd_triage 2013-07-07 13:47:44 UTC
I've updated the patch. It contains the following changes from the original:
- Use pathfix instead of gnomehack.
- Don't bump SHLIB_MAJOR. The API has not changed in incompatible ways.
  (In configure LIBCURRENT is 7 and LIBAGE is 6 so SHLIB_MAJOR should
  really be 1, but let's just keep it at 6 now.)
- Adjust post-patch to replace LIBCURRENT with SHLIB_MAJOR. Passing it in
  MAKE_ENV does not work.
- Add subversion properties.
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-07-29 18:13:03 UTC
Author: tijl
Date: Mon Jul 29 17:12:54 2013
New Revision: 323896
URL: http://svnweb.freebsd.org/changeset/ports/323896

Log:
  Update to 2.1.0.
  
  PR:		ports/167636
  Submitted by:	sunpoet (with modifications)
  Approved by:	kuriyama (maintainer)

Deleted:
  head/textproc/expat2/files/
Modified:
  head/textproc/expat2/Makefile   (contents, props changed)
  head/textproc/expat2/distinfo   (contents, props changed)
  head/textproc/expat2/pkg-plist   (contents, props changed)
Directory Properties:
  head/textproc/expat2/pkg-descr   (props changed)

Modified: head/textproc/expat2/Makefile
==============================================================================
--- head/textproc/expat2/Makefile	Mon Jul 29 16:58:22 2013	(r323895)
+++ head/textproc/expat2/Makefile	Mon Jul 29 17:12:54 2013	(r323896)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	expat
-# Date created:		Thu Aug 26 14:38:07 CEST 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
-#
+# Created by: Dirk Froemberg <dirk@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	expat
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.1.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -16,14 +11,20 @@ COMMENT=	XML 1.0 parser written in C
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	default
+USES=		pathfix
 USE_LDCONFIG=	yes
 MAN1=		xmlwf.1
 
+# Increment only when there are incompatible API changes.
 SHLIB_MAJOR=	6
 
-MAKE_ENV=	LIBCURRENT="${SHLIB_MAJOR}"
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e 's/@LIBCURRENT.*@/${SHLIB_MAJOR}/' \
+		-e '/^DESTDIR =/d' ${WRKSRC}/Makefile.in
+
 list-depend-ports:
 	cd ${PORTSDIR}; \
 	${FIND} . -mindepth 3 -maxdepth 3 -name Makefile -execdir ${SH} -c \

Modified: head/textproc/expat2/distinfo
==============================================================================
--- head/textproc/expat2/distinfo	Mon Jul 29 16:58:22 2013	(r323895)
+++ head/textproc/expat2/distinfo	Mon Jul 29 17:12:54 2013	(r323896)
@@ -1,2 +1,2 @@
-SHA256 (expat-2.0.1.tar.gz) = 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
-SIZE (expat-2.0.1.tar.gz) = 446456
+SHA256 (expat-2.1.0.tar.gz) = 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
+SIZE (expat-2.1.0.tar.gz) = 562616

Modified: head/textproc/expat2/pkg-plist
==============================================================================
--- head/textproc/expat2/pkg-plist	Mon Jul 29 16:58:22 2013	(r323895)
+++ head/textproc/expat2/pkg-plist	Mon Jul 29 17:12:54 2013	(r323896)
@@ -5,3 +5,4 @@ lib/libexpat.a
 lib/libexpat.la
 lib/libexpat.so
 lib/libexpat.so.%%SHLIB_MAJOR%%
+libdata/pkgconfig/expat.pc
_______________________________________________
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 4 Tijl Coosemans freebsd_committer freebsd_triage 2013-07-31 20:36:25 UTC
State Changed
From-To: open->closed

Committed in r323896.