svn commit: r364748 - head/sysutils/apt
Matthias Andree
mandree at FreeBSD.org
Tue Aug 12 22:55:26 UTC 2014
Author: mandree
Date: Tue Aug 12 22:55:25 2014
New Revision: 364748
URL: http://svnweb.freebsd.org/changeset/ports/364748
QAT: https://qat.redports.org/buildarchive/r364748/
Log:
Support staging, and modernize.
Fix PORTDOCS vs. EXAMPLESDIR.
No longer attempt removing dpkg's directories.
Add shebangfix for three scripts.
Modified:
head/sysutils/apt/Makefile
head/sysutils/apt/pkg-plist
Modified: head/sysutils/apt/Makefile
==============================================================================
--- head/sysutils/apt/Makefile Tue Aug 12 22:30:25 2014 (r364747)
+++ head/sysutils/apt/Makefile Tue Aug 12 22:55:25 2014 (r364748)
@@ -3,7 +3,7 @@
PORTNAME= apt
PORTVERSION= 0.6.46.4.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= apt_0.6.46.4-0.1
@@ -19,7 +19,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
-USES= gettext iconv gmake
+USES= gettext iconv gmake shebangfix
+SHEBANG_FILES= dselect/install \
+ dselect/setup \
+ dselect/update
USE_BDB= 44+
USE_LDCONFIG= yes
NO_FILTER_SHLIBS= yes
@@ -27,15 +30,12 @@ CPPFLAGS+= -I${LOCALBASE}/include/db${BD
LDFLAGS+= -L${LOCALBASE}/lib/db${BDB_VER} -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/apt-${PORTVERSION}
-MAN1= apt-extracttemplates.1 apt-ftparchive.1 apt-sortpkgs.1
-MAN5= apt.conf.5 apt_preferences.5 sources.list.5
-MAN8= apt-cache.8 apt-cdrom.8 apt-config.8 apt-get.8 apt-key.8 apt-secure.8
-
DPKGDIR?= /var/db/dpkg
APTDIR?= /var/db/apt
PLIST_SUB+= APTDIR=${APTDIR:C,^/,,}
-NO_STAGE= yes
+.include <bsd.port.options.mk>
+
post-patch:
${CP} ${FILESDIR}/https.cc ${FILESDIR}/https.h ${WRKSRC}/methods/
${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' -e \
@@ -50,87 +50,81 @@ post-patch:
${WRKSRC}/methods/gpgv.cc
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cache ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cdrom ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-config ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-extracttemplates ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-ftparchive ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-get ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-sortpkgs ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/apt-key ${PREFIX}/bin
-
- ${INSTALL_DATA} ${WRKSRC}/bin/libapt-inst.so.1.1.0 ${PREFIX}/lib
- (cd ${PREFIX}/lib; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so.1.1; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so)
- ${INSTALL_DATA} ${WRKSRC}/bin/libapt-pkg.so.3.11.0 ${PREFIX}/lib
- (cd ${PREFIX}/lib; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so.3.11; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so)
-
- ${MKDIR} ${PREFIX}/share/apt/keyrings
-
- ${MKDIR} ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/cdrom ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/copy ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/file ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/ftp ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gpgv ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gzip ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/http ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/https ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rred ${PREFIX}/libexec/apt/methods
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rsh ${PREFIX}/libexec/apt/methods
- (cd ${PREFIX}/libexec/apt/methods; ${LN} -sf rsh ssh; ${LN} -sf gzip bzip2)
-
- ${MKDIR} ${PREFIX}/libexec/dpkg/methods/apt
- ${INSTALL_DATA} ${WRKSRC}/scripts/dselect/desc.apt ${PREFIX}/libexec/dpkg/methods/apt
- ${INSTALL_DATA} ${WRKSRC}/scripts/dselect/names ${PREFIX}/libexec/dpkg/methods/apt
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/install ${PREFIX}/libexec/dpkg/methods/apt
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/setup ${PREFIX}/libexec/dpkg/methods/apt
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/update ${PREFIX}/libexec/dpkg/methods/apt
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cache ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cdrom ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-config ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-extracttemplates ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-ftparchive ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-get ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-sortpkgs ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/apt-key ${STAGEDIR}${PREFIX}/bin
+
+ ${INSTALL_DATA} ${WRKSRC}/bin/libapt-inst.so.1.1.0 ${STAGEDIR}${PREFIX}/lib
+ (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so.1.1; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so)
+ ${INSTALL_DATA} ${WRKSRC}/bin/libapt-pkg.so.3.11.0 ${STAGEDIR}${PREFIX}/lib
+ (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so.3.11; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so)
+
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/apt/keyrings
+
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/cdrom ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/copy ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/file ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/ftp ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gpgv ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gzip ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/http ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/https ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rred ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rsh ${STAGEDIR}${PREFIX}/libexec/apt/methods
+ (cd ${STAGEDIR}${PREFIX}/libexec/apt/methods; ${LN} -sf rsh ssh; ${LN} -sf gzip bzip2)
+
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
+ ${INSTALL_DATA} ${WRKSRC}/scripts/dselect/desc.apt ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
+ ${INSTALL_DATA} ${WRKSRC}/scripts/dselect/names ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
+ ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/install ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
+ ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/setup ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
+ ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/update ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
- ${MKDIR} ${PREFIX}/include/apt-pkg
+ ${MKDIR} ${STAGEDIR}${PREFIX}/include/apt-pkg
for f in ${WRKSRC}/include/apt-pkg/*; do \
- ${INSTALL_DATA} $${f} ${PREFIX}/include/apt-pkg; \
+ ${INSTALL_DATA} $${f} ${STAGEDIR}${PREFIX}/include/apt-pkg; \
done
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-extracttemplates.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-ftparchive.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-sortpkgs.1 ${MANPREFIX}/man/man1
-
- ${INSTALL_MAN} ${WRKSRC}/docs/apt.conf.5 ${MANPREFIX}/man/man5
- ${INSTALL_MAN} ${WRKSRC}/docs/apt_preferences.5 ${MANPREFIX}/man/man5
- ${INSTALL_MAN} ${WRKSRC}/docs/sources.list.5 ${MANPREFIX}/man/man5
-
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-cache.8 ${MANPREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-cdrom.8 ${MANPREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-config.8 ${MANPREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-get.8 ${MANPREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-key.8 ${MANPREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/docs/apt-secure.8 ${MANPREFIX}/man/man8
-
- ${MKDIR} ${PREFIX}/etc/apt/conf.d
- ${INSTALL_DATA} ${WRKSRC}/docs/examples/sources.list ${PREFIX}/etc/apt/sources.list.sample
- ${INSTALL_DATA} ${WRKSRC}/docs/examples/apt.conf ${PREFIX}/etc/apt/apt.conf.sample
-
- ${MKDIR} ${APTDIR}/cache/archives/partial
- ${MKDIR} ${APTDIR}/state/lists/partial
-
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/COPYING.GPL ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/README.progress-reporting ${DOCSDIR}
- ${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-extracttemplates.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-ftparchive.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-sortpkgs.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt_preferences.5 ${STAGEDIR}${MANPREFIX}/man/man5
+ ${INSTALL_MAN} ${WRKSRC}/docs/sources.list.5 ${STAGEDIR}${MANPREFIX}/man/man5
+
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-cache.8 ${STAGEDIR}${MANPREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-cdrom.8 ${STAGEDIR}${MANPREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-config.8 ${STAGEDIR}${MANPREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-get.8 ${STAGEDIR}${MANPREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-key.8 ${STAGEDIR}${MANPREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/docs/apt-secure.8 ${STAGEDIR}${MANPREFIX}/man/man8
+
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/apt/conf.d
+ ${INSTALL_DATA} ${WRKSRC}/docs/examples/sources.list ${STAGEDIR}${PREFIX}/etc/apt/sources.list.sample
+ ${INSTALL_DATA} ${WRKSRC}/docs/examples/apt.conf ${STAGEDIR}${PREFIX}/etc/apt/apt.conf.sample
+
+ ${MKDIR} ${STAGEDIR}${APTDIR}/cache/archives/partial
+ ${MKDIR} ${STAGEDIR}${APTDIR}/state/lists/partial
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/COPYING.GPL ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/README.progress-reporting ${STAGEDIR}${DOCSDIR}
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
for f in ${WRKSRC}/docs/examples/*; do \
- ${INSTALL_MAN} $${f} ${EXAMPLESDIR}; \
+ ${INSTALL_MAN} $${f} ${STAGEDIR}${EXAMPLESDIR}; \
done
.endif
-post-install:
- if [ ! -f ${PREFIX}/etc/apt/sources.list ]; then \
- ${CP} -p ${PREFIX}/etc/apt/sources.list.sample ${PREFIX}/etc/apt/sources.list; \
- fi
- if [ ! -f ${PREFIX}/etc/apt/apt.conf ]; then \
- ${CP} -p ${PREFIX}/etc/apt/apt.conf.sample ${PREFIX}/etc/apt/apt.conf; \
- fi
-
.include <bsd.port.mk>
Modified: head/sysutils/apt/pkg-plist
==============================================================================
--- head/sysutils/apt/pkg-plist Tue Aug 12 22:30:25 2014 (r364747)
+++ head/sysutils/apt/pkg-plist Tue Aug 12 22:55:25 2014 (r364748)
@@ -35,8 +35,6 @@ libexec/dpkg/methods/apt/install
libexec/dpkg/methods/apt/setup
libexec/dpkg/methods/apt/update
@dirrm libexec/dpkg/methods/apt
- at dirrmtry libexec/dpkg/methods
- at dirrmtry libexec/dpkg
include/apt-pkg/mmap.h
include/apt-pkg/error.h
include/apt-pkg/configuration.h
@@ -96,31 +94,39 @@ include/apt-pkg/extract.h
include/apt-pkg/dpkgdb.h
include/apt-pkg/dirstream.h
include/apt-pkg/debfile.h
+man/man1/apt-extracttemplates.1.gz
+man/man1/apt-ftparchive.1.gz
+man/man1/apt-sortpkgs.1.gz
+man/man5/apt.conf.5.gz
+man/man5/apt_preferences.5.gz
+man/man5/sources.list.5.gz
+man/man8/apt-cache.8.gz
+man/man8/apt-cdrom.8.gz
+man/man8/apt-config.8.gz
+man/man8/apt-get.8.gz
+man/man8/apt-key.8.gz
+man/man8/apt-secure.8.gz
@dirrm include/apt-pkg
@exec mkdir -p %D/etc/apt/conf.d
@dirrm etc/apt/conf.d
- at unexec if cmp -s %D/etc/apt/sources.list.sample %D/etc/apt/sources.list; then rm -f %D/etc/apt/sources.list; fi
-etc/apt/sources.list.sample
- at exec if [ ! -f %D/etc/apt/sources.list ]; then cp -p %D/%F %B/sources.list; fi
- at unexec if cmp -s %D/etc/apt/apt.conf.sample %D/etc/apt/apt.conf; then rm -f %D/etc/apt/apt.conf; fi
-etc/apt/apt.conf.sample
- at exec if [ ! -f %D/etc/apt/apt.conf ]; then cp -p %D/%F %B/apt.conf; fi
+ at sample etc/apt/sources.list.sample
+ at sample etc/apt/apt.conf.sample
@dirrm etc/apt
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
%%PORTDOCS%%%%DOCSDIR%%/README.progress-reporting
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/apt.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/sources.list
-%%PORTDOCS%%%%EXAMPLESDIR%%/configure-index
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apt.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sources.list
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configure-index
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
@cwd /
- at exec mkdir -p %%APTDIR%%/cache/archives/partial
+ at exec mkdir -p %D%%APTDIR%%/cache/archives/partial
@dirrm %%APTDIR%%/cache/archives/partial
@dirrm %%APTDIR%%/cache/archives
@dirrm %%APTDIR%%/cache
- at exec mkdir -p %%APTDIR%%/state/lists/partial
+ at exec mkdir -p %D%%APTDIR%%/state/lists/partial
@dirrm %%APTDIR%%/state/lists/partial
@dirrm %%APTDIR%%/state/lists
@dirrm %%APTDIR%%/state
More information about the svn-ports-all
mailing list