pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases Mechanical changes to add DESTDIR support to...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e37971237678
branches: trunk
changeset: 539311:e37971237678
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Mar 03 15:21:07 2008 +0000
description:
Mechanical changes to add DESTDIR support to packages that install
their files via a custom do-install target.
diffstat:
databases/adodb/Makefile | 67 +++++++++++++++++++-------------
databases/cstore/Makefile | 15 ++++--
databases/geneweb/Makefile | 61 +++++++++++++++--------------
databases/jdbc-postgresql80/Makefile | 18 +++++---
databases/jdbc-postgresql81/Makefile | 18 +++++---
databases/jdbc-postgresql82/Makefile | 13 +++--
databases/libpqxx-doc/Makefile | 16 +++++--
databases/lua-sqlite/Makefile | 14 ++++--
databases/mysqlcc/Makefile | 6 +-
databases/oraedit/Makefile | 6 +-
databases/phpldapadmin/Makefile | 32 +++++++++------
databases/phpmyadmin/Makefile | 39 ++++++++++--------
databases/sqlitemanager/Makefile | 12 +++--
databases/tcl-fbsql/Makefile | 6 +-
databases/unixodbc-DataManager/Makefile | 7 ++-
databases/unixodbc-ODBCConfig/Makefile | 7 ++-
databases/xsqlmenu/Makefile | 17 +++++--
databases/yap2lc/Makefile | 12 +++--
databases/yasql/Makefile | 13 +++--
19 files changed, 225 insertions(+), 154 deletions(-)
diffs (truncated from 812 to 300 lines):
diff -r d19528213530 -r e37971237678 databases/adodb/Makefile
--- a/databases/adodb/Makefile Mon Mar 03 15:18:42 2008 +0000
+++ b/databases/adodb/Makefile Mon Mar 03 15:21:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/11/25 17:53:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 15:21:07 jlam Exp $
#
DISTNAME= adodb496a
@@ -11,6 +11,8 @@
HOMEPAGE= http://adodb.sourceforge.net/
COMMENT= Active Data Objects Data Base for php4
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/adodb
NO_CONFIGURE= YES
NO_BUILD= YES
@@ -26,37 +28,46 @@
.endif
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/cute_icons_for_site
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/datadict
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/drivers
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/lang
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/perf
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/tests
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/xsl
- ${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/session
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/adodb
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/cute_icons_for_site
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/datadict
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/drivers
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/lang
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/perf
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/tests
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/xsl
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/session
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/adodb
- ${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/share/adodb
- ${INSTALL_DATA} ${WRKSRC}/*.dtd ${PREFIX}/share/adodb
+ ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PREFIX}/share/adodb
+ ${INSTALL_DATA} ${WRKSRC}/*.dtd ${DESTDIR}${PREFIX}/share/adodb
${INSTALL_DATA} ${WRKSRC}/cute_icons_for_site/*.gif \
- ${PREFIX}/share/adodb/cute_icons_for_site
+ ${DESTDIR}${PREFIX}/share/adodb/cute_icons_for_site
${INSTALL_DATA} ${WRKSRC}/datadict/*.php \
- ${PREFIX}/share/adodb/datadict
- ${INSTALL_DATA} ${WRKSRC}/drivers/*.php ${PREFIX}/share/adodb/drivers
- ${INSTALL_DATA} ${WRKSRC}/lang/*.php ${PREFIX}/share/adodb/lang
- ${INSTALL_DATA} ${WRKSRC}/perf/*.php ${PREFIX}/share/adodb/perf
- ${INSTALL_DATA} ${WRKSRC}/tests/*.php ${PREFIX}/share/adodb/tests
- ${INSTALL_DATA} ${WRKSRC}/tests/*.xml ${PREFIX}/share/adodb/tests
- ${INSTALL_DATA} ${WRKSRC}/session/*.php ${PREFIX}/share/adodb/session
- ${INSTALL_DATA} ${WRKSRC}/session/*.txt ${PREFIX}/share/adodb/session
- ${INSTALL_DATA} ${WRKSRC}/session/*.sql ${PREFIX}/share/adodb/session
- ${INSTALL_DATA} ${WRKSRC}/session/*.xml ${PREFIX}/share/adodb/session
- ${INSTALL_DATA} ${WRKSRC}/xsl/*.xsl ${PREFIX}/share/adodb/xsl
- ${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${PREFIX}/share/doc/adodb
- ${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/adodb
+ ${DESTDIR}${PREFIX}/share/adodb/datadict
+ ${INSTALL_DATA} ${WRKSRC}/drivers/*.php \
+ ${DESTDIR}${PREFIX}/share/adodb/drivers
+ ${INSTALL_DATA} ${WRKSRC}/lang/*.php \
+ ${DESTDIR}${PREFIX}/share/adodb/lang
+ ${INSTALL_DATA} ${WRKSRC}/perf/*.php \
+ ${DESTDIR}${PREFIX}/share/adodb/perf
+ ${INSTALL_DATA} ${WRKSRC}/tests/*.php \
+ ${DESTDIR}${PREFIX}/share/adodb/tests
+ ${INSTALL_DATA} ${WRKSRC}/tests/*.xml \
+ ${DESTDIR}${PREFIX}/share/adodb/tests
+ ${INSTALL_DATA} ${WRKSRC}/session/*.php \
+ ${DESTDIR}${PREFIX}/share/adodb/session
+ ${INSTALL_DATA} ${WRKSRC}/session/*.txt \
+ ${DESTDIR}${PREFIX}/share/adodb/session
+ ${INSTALL_DATA} ${WRKSRC}/session/*.sql \
+ ${DESTDIR}${PREFIX}/share/adodb/session
+ ${INSTALL_DATA} ${WRKSRC}/session/*.xml \
+ ${DESTDIR}${PREFIX}/share/adodb/session
+ ${INSTALL_DATA} ${WRKSRC}/xsl/*.xsl ${DESTDIR}${PREFIX}/share/adodb/xsl
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${DESTDIR}${PREFIX}/share/doc/adodb
+ ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/adodb
- ${FIND} ${PREFIX}/share/adodb -name \*.\* -type f -print | \
+ ${FIND} ${DESTDIR}${PREFIX}/share/adodb -name \*.\* -type f -print | \
${XARGS} ${CHMOD} ${SHAREMODE}
.include "../../mk/bsd.pkg.mk"
diff -r d19528213530 -r e37971237678 databases/cstore/Makefile
--- a/databases/cstore/Makefile Mon Mar 03 15:18:42 2008 +0000
+++ b/databases/cstore/Makefile Mon Mar 03 15:21:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/02/28 11:58:47 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 15:21:07 jlam Exp $
DISTNAME= cstore0.2
PKGNAME= cstore-0.2
@@ -12,6 +12,8 @@
HOMEPAGE= http://db.lcs.mit.edu/projects/cstore/
COMMENT= Read-optimised column store relational DBMS
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake perl
USE_LANGUAGES+= c c++
WRKSRC= ${WRKDIR}/cstore
@@ -62,11 +64,12 @@
cd ${WRKSRC}/src && ./cstoreqptest 0 createData.cnf global.cnf
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/cstoreqptest ${PREFIX}/bin/cstoreqp
- ${INSTALL_DATA_DIR} ${PREFIX}/cstore/data
- cd ${WRKSRC}/data && pax -rwpe . ${PREFIX}/cstore/data
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cstore
- cd ${WRKSRC}/doc && pax -rwpe . ${PREFIX}/share/doc/cstore
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/cstoreqptest \
+ ${DESTDIR}${PREFIX}/bin/cstoreqp
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/cstore/data
+ cd ${WRKSRC}/data && pax -rwpe . ${DESTDIR}${PREFIX}/cstore/data
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cstore
+ cd ${WRKSRC}/doc && pax -rwpe . ${DESTDIR}${PREFIX}/share/doc/cstore
.include "../../archivers/lzo/buildlink3.mk"
.include "../../databases/db4/buildlink3.mk"
diff -r d19528213530 -r e37971237678 databases/geneweb/Makefile
--- a/databases/geneweb/Makefile Mon Mar 03 15:18:42 2008 +0000
+++ b/databases/geneweb/Makefile Mon Mar 03 15:21:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:41 reed Exp $
+# $NetBSD: Makefile,v 1.31 2008/03/03 15:21:07 jlam Exp $
#
DISTNAME= geneweb-4.10
@@ -11,6 +11,9 @@
COMMENT= GeneWeb is a comprehensive genealogy database application
DIST_SUBDIR= ${PKGNAME_NOREV}nb1
+
+PKG_DESTDIR_SUPPORT= destdir
+
USE_TOOLS+= gmake
RCD_SCRIPTS= geneweb
@@ -49,35 +52,35 @@
cd ${WRKSRC} && ${GMAKE} distrib
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geneweb
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/geneweb
- ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/etc
- ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/gwtp_tmp
- ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/images
- ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/lang
- ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/setup
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/geneweb
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/geneweb
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/etc
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/images
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/lang
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/setup
cd ${WRKSRC}/distribution/gw && \
- ${INSTALL_PROGRAM} gwd ${PREFIX}/libexec && \
- ${INSTALL_PROGRAM} consang ${PREFIX}/bin && \
- ${INSTALL_PROGRAM} gwc ${PREFIX}/bin && \
- ${INSTALL_PROGRAM} gwtp_tmp/gwtp ${PREFIX}/bin && \
- ${INSTALL_PROGRAM} ged2gwb ${PREFIX}/bin && \
- ${INSTALL_PROGRAM} gwb2ged ${PREFIX}/bin && \
- ${INSTALL_PROGRAM} gwsetup ${PREFIX}/sbin && \
- ${INSTALL_PROGRAM} gwu ${PREFIX}/bin && \
- ${CP} -Rp doc/* ${PREFIX}/share/doc/geneweb && \
- ${CP} -Rp etc ${PREFIX}/share/geneweb && \
- ${CP} -Rp gwtp_tmp ${PREFIX}/share/geneweb && \
- ${CP} -Rp images ${PREFIX}/share/geneweb && \
- ${CP} -Rp lang ${PREFIX}/share/geneweb && \
- ${CP} -Rp setup ${PREFIX}/share/geneweb && \
- ${INSTALL_DATA} a.gwf ${PREFIX}/share/examples/geneweb && \
- ${INSTALL_DATA} only.txt ${PREFIX}/share/examples/geneweb
- ${TOUCH} ${PREFIX}/share/geneweb/gwtp_tmp/passwd
- ${TOUCH} ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
- ${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/passwd
- ${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
- ${CHOWN} -R nobody.${ROOT_GROUP} ${PREFIX}/share/geneweb
+ ${INSTALL_PROGRAM} gwd ${DESTDIR}${PREFIX}/libexec && \
+ ${INSTALL_PROGRAM} consang ${DESTDIR}${PREFIX}/bin && \
+ ${INSTALL_PROGRAM} gwc ${DESTDIR}${PREFIX}/bin && \
+ ${INSTALL_PROGRAM} gwtp_tmp/gwtp ${DESTDIR}${PREFIX}/bin && \
+ ${INSTALL_PROGRAM} ged2gwb ${DESTDIR}${PREFIX}/bin && \
+ ${INSTALL_PROGRAM} gwb2ged ${DESTDIR}${PREFIX}/bin && \
+ ${INSTALL_PROGRAM} gwsetup ${DESTDIR}${PREFIX}/sbin && \
+ ${INSTALL_PROGRAM} gwu ${DESTDIR}${PREFIX}/bin && \
+ ${CP} -Rp doc/* ${DESTDIR}${PREFIX}/share/doc/geneweb && \
+ ${CP} -Rp etc ${DESTDIR}${PREFIX}/share/geneweb && \
+ ${CP} -Rp gwtp_tmp ${DESTDIR}${PREFIX}/share/geneweb && \
+ ${CP} -Rp images ${DESTDIR}${PREFIX}/share/geneweb && \
+ ${CP} -Rp lang ${DESTDIR}${PREFIX}/share/geneweb && \
+ ${CP} -Rp setup ${DESTDIR}${PREFIX}/share/geneweb && \
+ ${INSTALL_DATA} a.gwf ${DESTDIR}${PREFIX}/share/examples/geneweb && \
+ ${INSTALL_DATA} only.txt ${DESTDIR}${PREFIX}/share/examples/geneweb
+ ${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
+ ${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
+ ${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
+ ${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
+ ${CHOWN} -R nobody.${ROOT_GROUP} ${DESTDIR}${PREFIX}/share/geneweb
.include "../../lang/ocaml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d19528213530 -r e37971237678 databases/jdbc-postgresql80/Makefile
--- a/databases/jdbc-postgresql80/Makefile Mon Mar 03 15:18:42 2008 +0000
+++ b/databases/jdbc-postgresql80/Makefile Mon Mar 03 15:21:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/01/07 23:18:09 abs Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 15:21:07 jlam Exp $
#
DISTNAME= postgresql-jdbc-8.0-${PGBUILD}.src
@@ -16,6 +16,8 @@
JARFILE= postgresql80.jar
EXTRACT_ONLY= ${DISTFILES:N*.jar}
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_JAVA= run
USE_JAVA2= 1.4
NO_BUILD= YES
@@ -27,12 +29,14 @@
PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
- ${INSTALL_DATA} ${DISTDIR}/${JARDIST} ${PREFIX}/lib/java/${JARFILE}
- ${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/${EXAMPLEDIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
+ ${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+ ${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/example/*.java \
+ ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d19528213530 -r e37971237678 databases/jdbc-postgresql81/Makefile
--- a/databases/jdbc-postgresql81/Makefile Mon Mar 03 15:18:42 2008 +0000
+++ b/databases/jdbc-postgresql81/Makefile Mon Mar 03 15:21:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/01/07 23:15:01 abs Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 15:21:07 jlam Exp $
#
DISTNAME= postgresql-jdbc-8.1-${PGBUILD}.src
@@ -16,6 +16,8 @@
JARFILE= postgresql81.jar
EXTRACT_ONLY= ${DISTFILES:N*.jar}
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_JAVA= run
USE_JAVA2= 1.4
NO_BUILD= YES
@@ -27,12 +29,14 @@
PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
- ${INSTALL_DATA} ${DISTDIR}/${JARDIST} ${PREFIX}/lib/java/${JARFILE}
- ${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/${EXAMPLEDIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
+ ${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+ ${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/example/*.java \
+ ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d19528213530 -r e37971237678 databases/jdbc-postgresql82/Makefile
--- a/databases/jdbc-postgresql82/Makefile Mon Mar 03 15:18:42 2008 +0000
+++ b/databases/jdbc-postgresql82/Makefile Mon Mar 03 15:21:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/07 23:04:56 abs Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 15:21:07 jlam Exp $
#
DISTNAME= postgresql-jdbc-8.2-${PGBUILD}.src
@@ -16,6 +16,8 @@
JARFILE= postgresql82.jar
Home |
Main Index |
Thread Index |
Old Index