Date: Thu, 04 Sep 2008 22:11:23 -0400 From: Alex Goncharov <alex-goncharov@comcast.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/127101: [maintainer update] databases/postgresql-odbc: a minor cleanup Message-ID: <E1KbQnD-000LQH-3w@daland.home> Resent-Message-ID: <200809050220.m852K3Ei081494@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127101
>Category: ports
>Synopsis: [maintainer update] databases/postgresql-odbc: a minor cleanup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 05 02:20:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Alex Goncharov
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
>Description:
A better handling of port data and document installation.
>How-To-Repeat:
>Fix:
A patch enclosed, to be run from /usr/ports.
--- databases-postgresql-odbc.diff begins here ---
diff -ruN databases/postgresql-odbc.orig/Makefile databases/postgresql-odbc/Makefile
--- databases/postgresql-odbc.orig/Makefile 2008-09-04 19:33:43.000000000 -0400
+++ databases/postgresql-odbc/Makefile 2008-09-04 20:16:46.000000000 -0400
@@ -55,18 +55,13 @@
DATADIR_1= ${DATADIR}/odbc
DOCSDIR_1= ${DOCSDIR}/odbc
post-install:
+.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR_1}
- ${INSTALL_DATA} ${WRKSRC}/odbc.sql ${DATADIR_1}
- ${INSTALL_DATA} ${WRKSRC}/odbc-drop.sql ${DATADIR_1}
+ ${INSTALL_DATA} ${WRKSRC}/*.sql ${DATADIR_1}
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR_1}
- ${TAR} -C ${WRKSRC}/docs --exclude '*Makefile*' -cf - . \
- | ${TAR} -C ${DOCSDIR_1} --unlink -xf -
-.if !defined(INSTALL_AS_USER)
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR_1}
- ${FIND} ${DOCSDIR_1} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
- ${FIND} ${DOCSDIR_1} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR_1}
.endif
.include <bsd.port.mk>
diff -ruN databases/postgresql-odbc.orig/pkg-plist databases/postgresql-odbc/pkg-plist
--- databases/postgresql-odbc.orig/pkg-plist 2008-09-04 19:33:43.000000000 -0400
+++ databases/postgresql-odbc/pkg-plist 2008-09-04 20:04:17.000000000 -0400
@@ -15,6 +15,6 @@
%%PORTDOCS%%%%DOCSDIR%%/odbc/unix-compilation.html
%%PORTDOCS%%%%DOCSDIR%%/odbc/win32-compilation.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/odbc
-share/postgresql/odbc/odbc-drop.sql
-share/postgresql/odbc/odbc.sql
-@dirrm share/postgresql/odbc
+%%PORTDATA%%%%DATADIR%%/odbc/odbc-drop.sql
+%%PORTDATA%%%%DATADIR%%/odbc/odbc.sql
+%%PORTDATA%%@dirrm %%DATADIR%%/odbc
--- databases-postgresql-odbc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1KbQnD-000LQH-3w>