Sun Mar 8 15:49:35 2015 UTC ()
Use lang/ruby/gem-extract.mk which replaces this package's own fetch and
extract routine.

No functional change.


(taca)
diff -r1.3 -r1.4 pkgsrc/devel/redmine/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/devel/redmine/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/redmine/Attic/Makefile 2015/03/01 13:42:02 1.3
+++ pkgsrc/devel/redmine/Attic/Makefile 2015/03/08 15:49:35 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2015/03/01 13:42:02 taca Exp $ 1# $NetBSD: Makefile,v 1.4 2015/03/08 15:49:35 taca Exp $
2 2
3DISTNAME= redmine-2.6.0 3DISTNAME= redmine-2.6.0
4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} 4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.redmine.org/releases/ 6MASTER_SITES= http://www.redmine.org/releases/
7MASTER_SITES+= https://rubygems.org/downloads/ 7MASTER_SITES+= https://rubygems.org/downloads/
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://www.redmine.org/ 10HOMEPAGE= http://www.redmine.org/
11COMMENT= Flexible project management web application 11COMMENT= Flexible project management web application
12LICENSE= gnu-gpl-v2 # and so on. 12LICENSE= gnu-gpl-v2 # and so on.
13 13
14RUBY_VERSION_SUPPORTED= 200 193 21 14RUBY_VERSION_SUPPORTED= 200 193 21
@@ -176,70 +176,46 @@ CONF_FILES+= ${EGDIR}/additional_environ @@ -176,70 +176,46 @@ CONF_FILES+= ${EGDIR}/additional_environ
176CONF_FILES+= ${EGDIR}/unicorn.rb.example \ 176CONF_FILES+= ${EGDIR}/unicorn.rb.example \
177 ${PREFIX}/${RM_DIR}/app/config/unicorn.rb 177 ${PREFIX}/${RM_DIR}/app/config/unicorn.rb
178 178
179.include "../../mk/bsd.prefs.mk" 179.include "../../mk/bsd.prefs.mk"
180 180
181APACHE_USER?= www 181APACHE_USER?= www
182APACHE_GROUP?= www 182APACHE_GROUP?= www
183PKG_GROUPS= ${APACHE_GROUP} 183PKG_GROUPS= ${APACHE_GROUP}
184PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} 184PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
185BUILD_DEFS+= APACHE_GROUP APACHE_USER 185BUILD_DEFS+= APACHE_GROUP APACHE_USER
186FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \ 186FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
187 RM_DIR=${RM_DIR} 187 RM_DIR=${RM_DIR}
188 188
189# XXX The following is borrowed from lang/ruby/gem.mk. 189GEM_EXTSDIR_NEEDS_SUBDIR= no
190# XXX Please integrate the following to lang/ruby/*.mk. 190.include "../../lang/ruby/gem-extract.mk"
191do-extract: 
192# Extract non-gem tarball 
193 ${RUN} extract_file=${_DISTDIR:Q}/${DISTFILES:M*${EXTRACT_SUFX}:Q}; export extract_file; \ 
194 cd ${WRKDIR} && cd ${EXTRACT_DIR.${DISTFILES:M*${EXTRACT_SUFX}:Q}} && ${EXTRACT_CMD} 
195# Extract gems 
196.for _gem_ in ${DISTFILES:M*.gem} 
197 ${RUN} cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \ 
198 ${RUBYGEM_NAME} unpack ${_DISTDIR:Q}/${_gem_:Q} 
199 ${RUN} cd ${WRKDIR} && \ 
200 ${SETENV} ${MAKE_ENV} TZ=UTC ${RUBYGEM_ENV} \ 
201 ${RUBYGEM_NAME} spec --ruby ${_DISTDIR:Q}/${_gem_:Q} > ${_gem_}spec 
202.endfor 
203 191
204do-build: 192do-build:
205.for _gem_ in ${DISTFILES:M*.gem:S/.gem$//g} 193.for _gem_ in ${DISTFILES:M*.gem:S/.gem$//g}
206 ${RUN} cd ${WRKDIR}/${_gem_} && ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \ 194 ${RUN} cd ${WRKDIR}/${_gem_} && ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \
207 ${RUBYGEM_NAME} build ../${_gem_}.gemspec 195 ${RUBYGEM_NAME} build ../${_gem_}.gemspec
208 ${RUN} ${TEST} -f ${WRKDIR}/${_gem_}/${_gem_}.gem || \ 196 ${RUN} ${TEST} -f ${WRKDIR}/${_gem_}/${_gem_}.gem || \
209 ${FAIL_MSG} "Build of ${_gem_}.gem failed." 197 ${FAIL_MSG} "Build of ${_gem_}.gem failed."
210.endfor 198.endfor
211 199
212RUBYGEM_INSTALL_ROOT= ${WRKDIR}/.inst 200RUBYGEM_INSTALL_ROOT= ${WRKDIR}/.inst
213RUBYGEM_INSTALL_ROOT_OPTION= --install-root ${RUBYGEM_INSTALL_ROOT} 201RUBYGEM_INSTALL_ROOT_OPTION= --install-root ${RUBYGEM_INSTALL_ROOT}
214_RUBYGEM_OPTIONS= --no-update-sources # don't cache the gem index 202_RUBYGEM_OPTIONS= --no-update-sources # don't cache the gem index
215_RUBYGEM_OPTIONS+= --install-dir ${PREFIX}/${GEM_HOME} 203_RUBYGEM_OPTIONS+= --install-dir ${PREFIX}/${GEM_HOME}
216_RUBYGEM_OPTIONS+= ${RUBYGEM_INSTALL_ROOT_OPTION} 204_RUBYGEM_OPTIONS+= ${RUBYGEM_INSTALL_ROOT_OPTION}
217_RUBYGEM_OPTIONS+= --ignore-dependencies 205_RUBYGEM_OPTIONS+= --ignore-dependencies
218_RUBYGEM_OPTIONS+= --no-ri --no-rdoc 206_RUBYGEM_OPTIONS+= --no-ri --no-rdoc
219 207
220.include "../../lang/ruby/rubyversion.mk" 208.include "../../lang/ruby/rubyversion.mk"
221.if !empty(RUBY_GEMS_VERSION) 
222_RUBYGEMS_MAJOR= ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//} 
223_RUBYGEMS_MINORS= ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//} 
224. if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2 
225GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VERSION} 
226. endif 
227. if !empty(GEM_EXTSDIR) 
228PLIST_SUBST+= GEM_EXTSDIR=${GEM_EXTSDIR} 
229. else 
230PLIST_SUBST+= GEM_EXTSDIR="@comment " 
231. endif 
232.endif 
233 209
234do-install: 210do-install:
235# Install gems 211# Install gems
236.for _gem_ in ${DISTFILES:M*.gem:S/.gem$//g} 212.for _gem_ in ${DISTFILES:M*.gem:S/.gem$//g}
237 @${STEP_MSG} "Installing gem into installation root" 213 @${STEP_MSG} "Installing gem into installation root"
238 ${RUN} ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \ 214 ${RUN} ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \
239 ${RUBYGEM_NAME} install --backtrace ${RUBYGEM_OPTIONS} \ 215 ${RUBYGEM_NAME} install --backtrace ${RUBYGEM_OPTIONS} \
240 ${_RUBYGEM_OPTIONS} --local ${WRKDIR}/${_gem_}/${_gem_}.gem 216 ${_RUBYGEM_OPTIONS} --local ${WRKDIR}/${_gem_}/${_gem_}.gem
241 @${STEP_MSG} "gem install" 217 @${STEP_MSG} "gem install"
242 218
243 ${RUN} cd ${RUBYGEM_INSTALL_ROOT}${PREFIX} && \ 219 ${RUN} cd ${RUBYGEM_INSTALL_ROOT}${PREFIX} && \
244 pax -rwpp . ${DESTDIR}${PREFIX} 220 pax -rwpp . ${DESTDIR}${PREFIX}
245.endfor 221.endfor