cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanups:

Browse Source 
* properly detect uuid from e2fsprogs
* disable mtab support
* use --disable-ldconfig instead of patching
* regen WANTLIB/LIB_DEPENDS/PLIST
This commit is contained in:
ajacoutot 2013-06-15 14:25:28 +00:00
parent 4a6f9fe674
commit fbfca42a04
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysutils/ntfs-3g/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/06/14 13:49:50 pirofti Exp $
# $OpenBSD: Makefile,v 1.2 2013/06/15 14:25:28 ajacoutot Exp $
COMMENT = FUSE NTFS driver with read/write support
@ -7,6 +7,7 @@ DISTNAME = ntfs-3g_ntfsprogs-${V}
PKGNAME = ntfs_3g-${V}
SHARED_LIBS += ntfs-3g 0.0 # .84
CATEGORIES = sysutils
REVISION = 0
HOMEPAGE = http://www.tuxera.com/
@ -15,11 +16,25 @@ MAINTAINER = Paul Irofti <pirofti@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c e2fs-uuid fuse
MASTER_SITES = ${HOMEPAGE}/opensource/
EXTRACT_SUFX = .tgz
WANTLIB = c
LIB_DEPENDS = sysutils/e2fsprogs
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--disable-mtab \
--disable-ldconfig
# uuid_generate(): properly pick up uuid from e2fsprogs instead of ossp-uuid
pre-configure:
perl -pi -e "s,-luuid,-le2fs-uuid,g" ${WRKSRC}/configure \
post-install:
rmdir ${WRKINST}/lib
.include <bsd.port.mk>

12
sysutils/ntfs-3g/patches/patch-src_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2013/06/14 13:49:50 pirofti Exp $
--- src/Makefile.in.orig Sun Jan 13 08:46:46 2013
+++ src/Makefile.in Fri Jun 14 14:18:50 2013
$OpenBSD: patch-src_Makefile_in,v 1.2 2013/06/15 14:25:28 ajacoutot Exp $
--- src/Makefile.in.orig Sun Jan 13 07:46:46 2013
+++ src/Makefile.in Sat Jun 15 16:23:19 2013
@@ -37,8 +37,7 @@ target_triplet = @target@
@ENABLE_NTFS_3G_TRUE@bin_PROGRAMS = ntfs-3g.probe$(EXEEXT) \
@ENABLE_NTFS_3G_TRUE@ ntfs-3g.usermap$(EXEEXT) \
@ -20,11 +20,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2013/06/14 13:49:50 pirofti Exp $
else :; fi; \
done
@@ -830,11 +829,10 @@ uninstall-man: uninstall-man8
@ENABLE_NTFS_3G_TRUE@drivers : $(FUSE_LIBS) ntfs-3g lowntfs-3g
@ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@install-exec-hook:
-@ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@ $(LDCONFIG)
@@ -834,7 +833,7 @@ uninstall-man: uninstall-man8
@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local: install-rootbinPROGRAMS
@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) "$(DESTDIR)/sbin"

4
sysutils/ntfs-3g/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/06/14 13:49:50 pirofti Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/06/15 14:25:28 ajacoutot Exp $
@bin bin/ntfs-3g
@bin bin/ntfs-3g.probe
@bin bin/ntfs-3g.secaudit
@ -71,7 +71,7 @@ lib/pkgconfig/libntfs-3g.pc
@man man/man8/ntfsprogs.8
@man man/man8/ntfsresize.8
@man man/man8/ntfsundelete.8
@bin sbin/mkfs.ntfs
sbin/mkfs.ntfs
@bin sbin/mkntfs
@bin sbin/ntfsclone
@bin sbin/ntfscp