pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/38520: DESTDIR support and clean-ups for mail/metamail



>Number:         38520
>Category:       pkg
>Synopsis:       DESTDIR support and clean-ups for mail/metamail
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 27 08:25:00 +0000 2008
>Originator:     cheusov%tut.by@localhost
>Release:        NetBSD 4.0_STABLE
>Organization:
>Environment:
System: NetBSD chen.chizhovka.net 4.0_STABLE NetBSD 4.0_STABLE (GENERIC) #3: 
Wed Apr 23 00:58:08 EEST 2008 
cheusov%chen.chizhovka.net@localhost:/srv/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
mail/metamail fails with USE_DESTDIR=full

   
http://www.mova.org/~cheusov/pub/pkgsrc-pbulk/NetBSD/current-destdir/log/20080426.0859/mail/metamail/stage_package.html
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/metamail/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile    22 Dec 2007 19:12:27 -0000      1.44
+++ Makefile    27 Apr 2008 08:20:01 -0000
@@ -13,18 +13,26 @@
 
 CONFLICTS+=    elm>=2.5.5 mm-2.7
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 
 CFLAGS.Linux+= -DLINUX
 CFLAGS.SunOS+= -DSYSV
-MAKE_ENV+=     PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} CHMOD=${CHMOD:Q} SED=${SED:Q}
+MAKE_ENV+=     PKG_SYSCONFDIR=${PKG_SYSCONFDIR} CHMOD=${CHMOD:Q} SED=${SED:Q}
 
 EGDIR=         ${PREFIX}/share/examples/metamail
 CONF_FILES=    ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
 USE_TOOLS+=    bdftopcf csh:run
 
+# the following is for DESTDIR support
+MAKE_FLAGS+=   LOCALBINDIR=${DESTDIR}${PREFIX}/bin
+MAKE_FLAGS+=   MAN1DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+MAKE_FLAGS+=   MAN4DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man4
+MAKE_FLAGS+=   MAILCAPDIR=${DESTDIR}${PREFIX}/share/examples/metamail
+
 REPLACE_INTERPRETER+=  csh
 REPLACE.csh.old=       /bin/csh
 REPLACE.csh.new=       ${CSH}
@@ -36,7 +44,7 @@
 REPLACE_FILES.csh+=    bin/sun-to-mime
 REPLACE_FILES.csh+=    fonts/Xmailto-hebrew fonts/Xshownonascii
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 ${EGDIR}
 
 SUBST_CLASSES+=                awk sys
 SUBST_STAGE.awk=       post-patch
@@ -52,6 +60,7 @@
        ${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
 
 pre-configure:
+       set -e; \
        if ${GREP} putenv /usr/include/stdlib.h >/dev/null;             \
        then                                                            \
                cd ${WRKSRC}/metamail;                                  \
@@ -59,7 +68,4 @@
                ${SED} -e s/putenv.o//g Makefile.pre-sed >Makefile;     \
        fi
 
-pre-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index