Bug 179954 - databases/pg_reorg: does not support pgsql 92
Summary: databases/pg_reorg: does not support pgsql 92
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-06-25 11:50 UTC by John Marino
Modified: 2013-07-21 18:24 UTC (History)
0 users

See Also:


Attachments
pg_reorg_want_version.patch (322 bytes, patch)
2013-06-25 12:39 UTC, Alexander Pyhalov
no flags Details | Diff
pg_reorg_18.patch (2.16 KB, patch)
2013-06-27 15:36 UTC, Alexander Pyhalov
no flags Details | Diff
pg_reorg_18.patch (2.65 KB, patch)
2013-06-27 16:28 UTC, Alexander Pyhalov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Marino 2013-06-25 11:50:00 UTC
It appears pg_org doesn't building with pgsql 92:

reorg.c
reorg.c: In function 'reorg_swap':
reorg.c:733: error: too many arguments to function 'RenameRelationInternal'
reorg.c:735: error: too many arguments to function 'RenameRelationInternal'
reorg.c:745: error: too many arguments to function 'RenameRelationInternal'
reorg.c:747: error: too many arguments to function 'RenameRelationInternal'
reorg.c:752: error: too many arguments to function 'RenameRelationInternal'
reorg.c:754: error: too many arguments to function 'RenameRelationInternal'
reorg.c:759: error: too many arguments to function 'RenameRelationInternal'
reorg.c:761: error: too many arguments to function 'RenameRelationInternal'
gmake[1]: *** [reorg.o] Error 1

Fix: 

There's a later version, but upstream says this project has stagnated and there's no indication the latest version supports pgsql92.

Suggest adding makefile directives to indicate this, e.g. WANT_PGSQL_VERSION= 91-
How-To-Repeat: Set the default pgsql version to 92, then rebuild everything include pg_reorg
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-25 11:50:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-25 11:50:08 UTC
Maintainer of databases/pg_reorg,

Please note that PR ports/179954 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179954

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Alexander Pyhalov 2013-06-25 12:39:13 UTC
Hello.
I've tested the following patch on my local (9.1) system.
It should fallback to 91 if something newer was chosen by user.
Please, test if it works for you.

-- 
Best regards,
Alexander Pyhalov,
system administrator of Computer Center of Southern Federal University
Comment 4 John Marino 2013-06-26 10:58:25 UTC
Hmm, gnats did not send me this response, I had to look manually.

This is not easy for me to test, honestly.
Secondly, is that the proper use of WANT_PGSQL_VER ?  I assumed that if 
a range of pgsql was defined, and if the current installation of pgsql 
met that criteria, it would pass the check, otherwise install the pgsql 
default.

I'm not sure about that though -- a FreeBSD ports committer should weigh 
in on the best approach here.  This patch looks a bit funny to me.

John
Comment 5 Alexander Pyhalov 2013-06-27 15:36:36 UTC
Excuse me, I thought you checked that pg_reorg doesn't support 
postgresql 92  at all.
However, it seems that 9.1.8 version supports it. The suggested patch 
updates pg_reorg. It works with postgresql 9.2.

On 06/25/2013 15:39, Alexander Pyhalov wrote:
> Hello.
> I've tested the following patch on my local (9.1) system.
> It should fallback to 91 if something newer was chosen by user.
> Please, test if it works for you.
>



-- 
Best regards,
Alexander Pyhalov,
system administrator of Computer Center of Southern Federal University
Comment 6 Alexander Pyhalov 2013-06-27 16:28:14 UTC
One more change: we should treat differently 9.1 and previous versions: 
they don't support extensions, so plist is different.

-- 
Best regards,
Alexander Pyhalov,
system administrator of Computer Center of Southern Federal University
Comment 7 John Marino freebsd_committer freebsd_triage 2013-07-12 22:54:20 UTC
State Changed
From-To: feedback->open

Maintainer has fixed.
Comment 8 John Marino freebsd_committer freebsd_triage 2013-07-18 09:09:10 UTC
Responsible Changed
From-To: freebsd-ports-bugs->marino

Despite the rapid action by maintainer and two public pleas, nobody else 
took it.
Comment 9 dfilter service freebsd_committer freebsd_triage 2013-07-21 18:16:27 UTC
Author: marino
Date: Sun Jul 21 17:16:14 2013
New Revision: 323404
URL: http://svnweb.freebsd.org/changeset/ports/323404

Log:
  databases/pg_reorg: Upgrade to v1.1.8, use DESTDIR
  
  This version upgrade is required for PostgreSQL 9.2 support and was
  proposed by the maintainer.  Additional changes were added by myself:
    1) Header trimmed
    2) USE_GMAKE changed to USES+=gmake
    3) NOPORTSDOCS changed to options/DOCS
    4) Proposed logic for alternative PLIST was replaced with DESTDIR support
  
  The package list changes directory structure depending if postgresql 91
  or higher client is used.  This could have been handled with PLIST_SUB
  (rather than an alternate pkg-plist) but PGSQL_VER variable isn't
  evaluated until much later.  Using an intermediate DESTDIR scheme not
  only makes the DOCS option handling cleaner, it makes the pkg-plist creation
  bulletproof.  It also gives this port a head start for future "Stage" support.
  
  PR:		ports/179954
  Submitted by:	marino
  Approved by:	bapt (mentor), maintainer

Deleted:
  head/databases/pg_reorg/pkg-plist
Modified:
  head/databases/pg_reorg/Makefile
  head/databases/pg_reorg/distinfo

Modified: head/databases/pg_reorg/Makefile
==============================================================================
--- head/databases/pg_reorg/Makefile	Sun Jul 21 16:40:20 2013	(r323403)
+++ head/databases/pg_reorg/Makefile	Sun Jul 21 17:16:14 2013	(r323404)
@@ -1,28 +1,42 @@
-# New ports collection makefile for:	pg_reorg
-# Date created:			January 15, 2011
-# Whom:					alp@sfedu.ru
+# Created by: Alexander Pyhalov <alp@sfedu.ru>
 # $FreeBSD$
 
 PORTNAME=	pg_reorg
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/3104/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/3395/
 
 MAINTAINER=	alp@sfedu.ru
 COMMENT=	PostgreSQL utility to reorganize tables
 
 LICENSE=	BSD
 
-MAKE_ENV=	USE_PGXS=0
-USE_GMAKE=	yes
+DESTINY=	${WRKDIR}/destino
+MAKE_ENV=	USE_PGXS=0 \
+		DESTDIR=${DESTINY}
+USES=		gmake
 USE_PGSQL=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DESTINY}${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DESTINY}${DOCSDIR}/)
 .endif
+	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/
+	@cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+	   ${SORT} > ${WRKDIR}/PLIST.all
+	@cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
+	   ${SED} -e '/lib\/postgresql$$/d' -e '/share\/doc$$/d' \
+	   -e '/share\/postgresql$$/d' -e '/share\/postgresql\/extension$$/d' \
+	   -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/lib/postgresql 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/postgresql/extension 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/postgresql 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/databases/pg_reorg/distinfo
==============================================================================
--- head/databases/pg_reorg/distinfo	Sun Jul 21 16:40:20 2013	(r323403)
+++ head/databases/pg_reorg/distinfo	Sun Jul 21 17:16:14 2013	(r323404)
@@ -1,2 +1,2 @@
-SHA256 (pg_reorg-1.1.7.tar.gz) = 5ca0b75ee3136e85768621e2e9fd1e0969588bffe7ddbeba69b292226bd2cf21
-SIZE (pg_reorg-1.1.7.tar.gz) = 56686
+SHA256 (pg_reorg-1.1.8.tar.gz) = 7abf7e7be4c6519caaced4bf44a43321b620e6128fa1be63f58a534894f54c4d
+SIZE (pg_reorg-1.1.8.tar.gz) = 59185
_______________________________________________
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 10 John Marino freebsd_committer freebsd_triage 2013-07-21 18:24:16 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!