sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install header and .pc (pkg-config) files, too.

Browse source 
Reported by:	ehaupt@
This commit is contained in:
Matthias Andree 2017-10-29 15:42:09 +00:00
parent 14c69a0df0
commit 11a1e89fc7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=453120
3 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sysutils/e2fsprogs/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= e2fsprogs PORTNAME= e2fsprogs
PORTVERSION= 1.43.7 PORTVERSION= 1.43.7
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES?= sysutils CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@ -40,6 +40,8 @@ MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
MAKE_ENV+= CHECK_CMD=@true MAKE_ENV+= CHECK_CMD=@true
.if !defined(MASTERDIR) .if !defined(MASTERDIR)
INSTALL_TARGET= install install-libs
OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS
OPTIONS_EXCLUDE+= EXAMPLES OPTIONS_EXCLUDE+= EXAMPLES
OPTIONS_SUB= yes OPTIONS_SUB= yes
@ -222,6 +224,11 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor .endfor
.endif .endif
# ditch files installed by other ports already, or shadowing system files:
cd ${STAGEDIR}${PREFIX} && \
${XARGS} <${FILESDIR}/unwanted ${RM} && \
${RMDIR} include/blkid include/et include/ss share/et share/ss
# #
# the next line closes .if ${MASTERDIR} == ${.CURDIR} # the next line closes .if ${MASTERDIR} == ${.CURDIR}
.endif .endif

28
sysutils/e2fsprogs/files/unwanted Normal file
View file

@ -0,0 +1,28 @@
lib/libblkid.so
lib/libblkid.so.1
lib/libblkid.so.1.0
lib/libss.so
lib/libss.so.2
lib/libss.so.2.0
bin/compile_et
bin/mk_cmds
include/blkid/blkid.h
include/blkid/blkid_types.h
include/com_err.h
include/et/com_err.h
include/ss/ss.h
include/ss/ss_err.h
lib/libblkid.a
lib/libcom_err.a
lib/libss.a
libdata/pkgconfig/blkid.pc
libdata/pkgconfig/com_err.pc
libdata/pkgconfig/ss.pc
man/man1/compile_et.1
man/man1/mk_cmds.1
man/man3/com_err.3
man/man3/libblkid.3
share/et/et_c.awk
share/et/et_h.awk
share/ss/ct_c.awk
share/ss/ct_c.sed

18
sysutils/e2fsprogs/pkg-plist
View file

@ -86,6 +86,18 @@ lib/libe2p.so.2.3
lib/libext2fs.so lib/libext2fs.so
lib/libext2fs.so.2 lib/libext2fs.so.2
lib/libext2fs.so.2.4 lib/libext2fs.so.2.4
@comment lib/libss.so include/e2p/e2p.h
@comment lib/libss.so.2 include/ext2fs/bitops.h
@comment lib/libss.so.2.0 include/ext2fs/ext2_err.h
include/ext2fs/ext2_ext_attr.h
include/ext2fs/ext2_fs.h
include/ext2fs/ext2_io.h
include/ext2fs/ext2_types.h
include/ext2fs/ext2fs.h
include/ext2fs/ext3_extents.h
include/ext2fs/qcow2.h
include/ext2fs/tdb.h
lib/libe2p.a
lib/libext2fs.a
libdata/pkgconfig/e2p.pc
libdata/pkgconfig/ext2fs.pc