Sun Jan 20 12:30:54 2013 UTC ()
Reset PKGREVISION.


(ryoon)
diff -r1.79 -r1.80 pkgsrc/devel/subversion-base/Makefile

cvs diff -r1.79 -r1.80 pkgsrc/devel/subversion-base/Makefile (switch to unified diff)

--- pkgsrc/devel/subversion-base/Makefile 2012/12/16 01:52:12 1.79
+++ pkgsrc/devel/subversion-base/Makefile 2013/01/20 12:30:54 1.80
@@ -1,103 +1,102 @@ @@ -1,103 +1,102 @@
1# $NetBSD: Makefile,v 1.79 2012/12/16 01:52:12 obache Exp $ 1# $NetBSD: Makefile,v 1.80 2013/01/20 12:30:54 ryoon Exp $
2 2
3PKGNAME= subversion-base-${SVNVER} 3PKGNAME= subversion-base-${SVNVER}
4PKGREVISION= 6 
5COMMENT= Version control system, base programs and libraries 4COMMENT= Version control system, base programs and libraries
6 5
7PKG_INSTALLATION_TYPES= overwrite pkgviews 6PKG_INSTALLATION_TYPES= overwrite pkgviews
8 7
9# on at least solaris, configure fails to figure out 8# on at least solaris, configure fails to figure out
10# that you need -lintl 9# that you need -lintl
11BROKEN_GETTEXT_DETECTION= yes 10BROKEN_GETTEXT_DETECTION= yes
12 11
13.include "../../devel/subversion/Makefile.common" 12.include "../../devel/subversion/Makefile.common"
14 13
15USE_TOOLS+= msgfmt 14USE_TOOLS+= msgfmt
16 15
17CONFIGURE_ARGS+= --disable-neon-version-check 16CONFIGURE_ARGS+= --disable-neon-version-check
18CONFIGURE_ARGS+= --without-apxs 17CONFIGURE_ARGS+= --without-apxs
19 18
20.if !empty(PKG_OPTIONS:Mapr1) 19.if !empty(PKG_OPTIONS:Mapr1)
21APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util 20APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
22.else 21.else
23APU_OPTIONS= PKG_BUILD_OPTIONS.apr 22APU_OPTIONS= PKG_BUILD_OPTIONS.apr
24.endif 23.endif
25BUILD_DEFS+= ${APU_OPTIONS} 24BUILD_DEFS+= ${APU_OPTIONS}
26 25
27.if !empty(PKG_OPTIONS:Mapr1) 26.if !empty(PKG_OPTIONS:Mapr1)
28. include "../../devel/apr/buildlink3.mk" 27. include "../../devel/apr/buildlink3.mk"
29. include "../../devel/apr-util/buildlink3.mk" 28. include "../../devel/apr-util/buildlink3.mk"
30.else 29.else
31BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5 30BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
32. include "../../devel/apr0/buildlink3.mk" 31. include "../../devel/apr0/buildlink3.mk"
33.endif 32.endif
34 33
35BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4 34BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4
36.include "../../databases/sqlite3/buildlink3.mk" 35.include "../../databases/sqlite3/buildlink3.mk"
37.include "../../devel/zlib/buildlink3.mk" 36.include "../../devel/zlib/buildlink3.mk"
38 37
39PLIST_VARS+= db4 38PLIST_VARS+= db4
40.if !empty(PKG_OPTIONS:Mapr1) && !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4) 39.if !empty(PKG_OPTIONS:Mapr1) && !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
41PLIST.db4= yes 40PLIST.db4= yes
42#CONFIGURE_ARGS+= --with-berkeley-db=:${BUILDLINK_PREFIX.db4:Q}/include:${BUILDLINK_PREFIX.db4:Q}/lib:${BUILDLINK_LDADD.db4:S/^-l//:Q} 41#CONFIGURE_ARGS+= --with-berkeley-db=:${BUILDLINK_PREFIX.db4:Q}/include:${BUILDLINK_PREFIX.db4:Q}/lib:${BUILDLINK_LDADD.db4:S/^-l//:Q}
43CONFIGURE_ARGS+= --with-berkeley-db 42CONFIGURE_ARGS+= --with-berkeley-db
44.else 43.else
45CONFIGURE_ARGS+= --without-berkeley-db 44CONFIGURE_ARGS+= --without-berkeley-db
46.endif 45.endif
47 46
48PLIST_SUBST+= DAV_RA=${DAV_RA:Q} 47PLIST_SUBST+= DAV_RA=${DAV_RA:Q}
49 48
50SUBST_CLASSES+= paths 49SUBST_CLASSES+= paths
51SUBST_STAGE.paths= pre-configure 50SUBST_STAGE.paths= pre-configure
52SUBST_FILES.paths= contrib/cgi/tweak-log.cgi 51SUBST_FILES.paths= contrib/cgi/tweak-log.cgi
53SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g" 52SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g"
54SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths. 53SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths.
55 54
56RCD_SCRIPTS= svnserve 55RCD_SCRIPTS= svnserve
57 56
58post-install: 57post-install:
59 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC} 58 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC}
60 cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC} 59 cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC}
61 cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC} 60 cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC}
62 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup 61 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup
63 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi 62 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi
64 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts 63 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts
65 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer 64 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
66 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests 65 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
67 ${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \ 66 ${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
68 ${DESTDIR}${SVNEXAMPLES}/backup 67 ${DESTDIR}${SVNEXAMPLES}/backup
69 ${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \ 68 ${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \
70 ${DESTDIR}${SVNEXAMPLES}/cgi 69 ${DESTDIR}${SVNEXAMPLES}/cgi
71 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit* \ 70 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit* \
72 ${DESTDIR}${SVNEXAMPLES}/hook-scripts 71 ${DESTDIR}${SVNEXAMPLES}/hook-scripts
73 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \ 72 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
74 ${DESTDIR}${SVNEXAMPLES}/hook-scripts 73 ${DESTDIR}${SVNEXAMPLES}/hook-scripts
75 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \ 74 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \
76 ${WRKSRC}/tools/hook-scripts/verify-po.py \ 75 ${WRKSRC}/tools/hook-scripts/verify-po.py \
77 ${DESTDIR}${SVNEXAMPLES}/hook-scripts 76 ${DESTDIR}${SVNEXAMPLES}/hook-scripts
78 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer* \ 77 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer* \
79 ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer 78 ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
80 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/mailer* \ 79 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/mailer* \
81 ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests 80 ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
82 81
83.PHONY: svn-build-outputs-hack 82.PHONY: svn-build-outputs-hack
84# Subversion's build system is set up to build everything from source 83# Subversion's build system is set up to build everything from source
85# at once. In pkgsrc, we install the base part of subversion, and 84# at once. In pkgsrc, we install the base part of subversion, and
86# then build other pieces against installed libraries. Here, we run 85# then build other pieces against installed libraries. Here, we run
87# svn's equivalent of automake to say that the libraries installed as 86# svn's equivalent of automake to say that the libraries installed as
88# part of subversion-base are installed, and save that generated file. 87# part of subversion-base are installed, and save that generated file.
89# Other packages then copy this file into place when building to avoid 88# Other packages then copy this file into place when building to avoid
90# having to build these libraries again. 89# having to build these libraries again.
91# 90#
92# The normal update procedure is 91# The normal update procedure is
93# test build and package subversion-base 92# test build and package subversion-base
94# run make svn-build-outputs-hack 93# run make svn-build-outputs-hack
95# test build and package other subversion packages 94# test build and package other subversion packages
96# commit the update to ../subversion/files/build-outputs.mk along with the version change 95# commit the update to ../subversion/files/build-outputs.mk along with the version change
97# 96#
98svn-build-outputs-hack: 97svn-build-outputs-hack:
99 cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc 98 cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
100 ${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk 99 ${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
101 100
102.include "../../devel/gettext-lib/buildlink3.mk" 101.include "../../devel/gettext-lib/buildlink3.mk"
103.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"