Sun May 20 06:24:54 2012 UTC ()
www/htdig: Fix unwanted directory removal

Add share/htdig/common to INSTALLATION_DIRS since it's installing files
there.  Without it, share/htdig/common is left over after www/htdig is
deinstalled.


(marino)
diff -r1.39 -r1.40 pkgsrc/www/htdig/Makefile

cvs diff -r1.39 -r1.40 pkgsrc/www/htdig/Makefile (expand / switch to unified diff)

--- pkgsrc/www/htdig/Makefile 2011/12/05 10:18:17 1.39
+++ pkgsrc/www/htdig/Makefile 2012/05/20 06:24:54 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2011/12/05 10:18:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.40 2012/05/20 06:24:54 marino Exp $
2 2
3DISTNAME= htdig-3.2.0b6 3DISTNAME= htdig-3.2.0b6
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= www databases 5CATEGORIES= www databases
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=htdig/} \ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=htdig/} \
7 http://www.htdig.org/files/ \ 7 http://www.htdig.org/files/ \
8 http://www.it.htdig.org/files/ 8 http://www.it.htdig.org/files/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://htdig.sourceforge.net/ 12HOMEPAGE= http://htdig.sourceforge.net/
13COMMENT= WWW indexing and searching system 13COMMENT= WWW indexing and searching system
14 14
@@ -17,26 +17,27 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -17,26 +17,27 @@ PKG_DESTDIR_SUPPORT= user-destdir
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin 20CONFIGURE_ARGS+= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin
21CONFIGURE_ARGS+= --with-common-dir=${PREFIX}/share/htdig/common 21CONFIGURE_ARGS+= --with-common-dir=${PREFIX}/share/htdig/common
22CONFIGURE_ARGS+= --with-config-dir=${PKG_SYSCONFDIR:Q} 22CONFIGURE_ARGS+= --with-config-dir=${PKG_SYSCONFDIR:Q}
23CONFIGURE_ARGS+= --with-database-dir=${DBDIR:Q} 23CONFIGURE_ARGS+= --with-database-dir=${DBDIR:Q}
24CONFIGURE_ARGS+= --with-image-dir=${PREFIX}/share/examples/htdig 24CONFIGURE_ARGS+= --with-image-dir=${PREFIX}/share/examples/htdig
25CONFIGURE_ARGS+= --with-search-dir=${PREFIX}/share/examples/htdig 25CONFIGURE_ARGS+= --with-search-dir=${PREFIX}/share/examples/htdig
26CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread" 26CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread"
27CXXFLAGS+= -Wno-deprecated 27CXXFLAGS+= -Wno-deprecated
28 28
29PKG_SYSCONFSUBDIR= htdig 29PKG_SYSCONFSUBDIR= htdig
 30INSTALLATION_DIRS+= share/htdig/common
30 31
31DBDIR?= ${VARBASE}/db/htdig 32DBDIR?= ${VARBASE}/db/htdig
32MESSAGE_SUBST+= DBDIR=${DBDIR} 33MESSAGE_SUBST+= DBDIR=${DBDIR}
33OWN_DIRS+= ${DBDIR} 34OWN_DIRS+= ${DBDIR}
34 35
35CONF_FILES+= ${PREFIX}/share/examples/htdig/HtFileType-magic.mime \ 36CONF_FILES+= ${PREFIX}/share/examples/htdig/HtFileType-magic.mime \
36 ${PKG_SYSCONFDIR}/HtFileType-magic.mime 37 ${PKG_SYSCONFDIR}/HtFileType-magic.mime
37CONF_FILES+= ${PREFIX}/share/examples/htdig/cookies.txt \ 38CONF_FILES+= ${PREFIX}/share/examples/htdig/cookies.txt \
38 ${PKG_SYSCONFDIR}/cookies.txt 39 ${PKG_SYSCONFDIR}/cookies.txt
39CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \ 40CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \
40 ${PKG_SYSCONFDIR}/htdig.conf 41 ${PKG_SYSCONFDIR}/htdig.conf
41CONF_FILES+= ${PREFIX}/share/examples/htdig/mime.types \ 42CONF_FILES+= ${PREFIX}/share/examples/htdig/mime.types \
42 ${PKG_SYSCONFDIR}/mime.types 43 ${PKG_SYSCONFDIR}/mime.types