svn commit: r332199 - head/comms/libimobiledevice

Alexey Dokuchaev danfe at FreeBSD.org
Thu Oct 31 03:59:58 UTC 2013


Author: danfe
Date: Thu Oct 31 03:59:57 2013
New Revision: 332199
URL: http://svnweb.freebsd.org/changeset/ports/332199

Log:
  None of the binaries installed by comms/libimobiledevice are actually linked
  to gnutls/gcrypt/tasn1, while they are explicitly listed in the LIB_DEPENDS,
  remove them.  Judging from configure script, GnuTLS is used only when OpenSSL
  is explicitly disabled with --disable-openssl; Gentoo ebuild agrees.  OpenSSL
  is preferred, and is our standard SSL provider.  If GnuTLS is required for
  some special feature of libimobiledevice, it can be introduced as an OPTION.
  While here: stagify the port, use modern LIB_DEPENDS syntax.
  
  Approved by:	maintainer (avilla; timeout since May 16th)

Modified:
  head/comms/libimobiledevice/Makefile
  head/comms/libimobiledevice/pkg-plist

Modified: head/comms/libimobiledevice/Makefile
==============================================================================
--- head/comms/libimobiledevice/Makefile	Thu Oct 31 02:59:17 2013	(r332198)
+++ head/comms/libimobiledevice/Makefile	Thu Oct 31 03:59:57 2013	(r332199)
@@ -22,11 +22,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${SLAVE_PORT} == "no"
 
-LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
-		tasn1:${PORTSDIR}/security/libtasn1 \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		plist:${PORTSDIR}/devel/libplist \
-		usbmuxd:${PORTSDIR}/comms/usbmuxd
+LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
+		libusbmuxd.so:${PORTSDIR}/comms/usbmuxd
 
 USE_GNOME=	glib20
 CONFIGURE_ARGS+=--without-cython
@@ -35,14 +32,7 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS NEWS README
 
-MAN1=		idevice_id.1 idevicebackup.1 idevicebackup2.1 idevicedate.1 \
-		idevicedebugserverproxy.1 idevicediagnostics.1 \
-		ideviceenterrecovery.1 ideviceimagemounter.1 ideviceinfo.1 \
-		idevicepair.1 ideviceprovision.1 idevicescreenshot.1 \
-		idevicesyslog.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, *@ssl_requires@,,' \
@@ -51,10 +41,8 @@ post-patch:
 		${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .endif # ${SLAVE_PORT} == "no"
 

Modified: head/comms/libimobiledevice/pkg-plist
==============================================================================
--- head/comms/libimobiledevice/pkg-plist	Thu Oct 31 02:59:17 2013	(r332198)
+++ head/comms/libimobiledevice/pkg-plist	Thu Oct 31 03:59:57 2013	(r332199)
@@ -34,4 +34,17 @@ lib/libimobiledevice.la
 lib/libimobiledevice.so
 lib/libimobiledevice.so.4
 libdata/pkgconfig/libimobiledevice-1.0.pc
+man/man1/idevice_id.1.gz
+man/man1/idevicebackup.1.gz
+man/man1/idevicebackup2.1.gz
+man/man1/idevicedate.1.gz
+man/man1/idevicedebugserverproxy.1.gz
+man/man1/idevicediagnostics.1.gz
+man/man1/ideviceenterrecovery.1.gz
+man/man1/ideviceimagemounter.1.gz
+man/man1/ideviceinfo.1.gz
+man/man1/idevicepair.1.gz
+man/man1/ideviceprovision.1.gz
+man/man1/idevicescreenshot.1.gz
+man/man1/idevicesyslog.1.gz
 @dirrm include/libimobiledevice


More information about the svn-ports-all mailing list