Wed Dec 26 18:46:01 2012 UTC ()
Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.


(asau)
diff -r1.8 -r1.9 pkgsrc/www/apache-roller/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/www/apache-roller/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-roller/Makefile 2012/12/20 14:31:46 1.8
+++ pkgsrc/www/apache-roller/Makefile 2012/12/26 18:46:00 1.9
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.8 2012/12/20 14:31:46 spz Exp $ 1# $NetBSD: Makefile,v 1.9 2012/12/26 18:46:00 asau Exp $
2# 2#
3 3
4DISTNAME= roller-weblogger-${ROLLER_VER}-for-tomcat 4DISTNAME= roller-weblogger-${ROLLER_VER}-for-tomcat
5PKGNAME= apache-roller-${ROLLER_VER} 5PKGNAME= apache-roller-${ROLLER_VER}
6WRKSRC= ${WRKDIR}/${DISTNAME:S/-for//} 6WRKSRC= ${WRKDIR}/${DISTNAME:S/-for//}
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_APACHE:=roller/roller-5/v${ROLLER_VER}/bin/} 8MASTER_SITES= ${MASTER_SITE_APACHE:=roller/roller-5/v${ROLLER_VER}/bin/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://roller.apache.org/ 11HOMEPAGE= http://roller.apache.org/
12COMMENT= Full-featured, multi-user and group-blog server 12COMMENT= Full-featured, multi-user and group-blog server
13 13
14BUILD_DEPENDS+= fastjar-[0-9]*:../../archivers/fastjar 14BUILD_DEPENDS+= fastjar-[0-9]*:../../archivers/fastjar
15 15
16USE_JAVA= run 16USE_JAVA= run
17USE_JAVA2= 1.5 17USE_JAVA2= 1.5
18ROLLER_VER= 5.0.1 18ROLLER_VER= 5.0.1
19 19
20PKG_DESTDIR_SUPPORT= user-destdir 
21PLIST_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} 20PLIST_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q}
22 21
23.include "options.mk" 22.include "options.mk"
24 23
25do-build: 24do-build:
26 : 25 :
27 26
28do-install: 27do-install:
29 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/apache-roller 28 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/apache-roller
30 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/apache-roller 29 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/apache-roller
31 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/apache-roller 30 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/apache-roller
32 31
33 ${INSTALL_DATA} ${WRKSRC}/docs/roller-*.pdf \ 32 ${INSTALL_DATA} ${WRKSRC}/docs/roller-*.pdf \