- Switch back to CFLAGS/LDFLAGS to fix configure in py-libimobiledevice

after r364564 [1]
- Convert to USES=libtool

Reported by:	antoine [1]

comms/libimobiledevice/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	libimobiledevice
 PORTVERSION=	1.1.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	comms
 MASTER_SITES=	http://www.${PORTNAME}.org/downloads/
 
@@ -13,13 +13,14 @@ LICENSE?=	LGPL21
 
 SLAVE_PORT?=	no
 
-USES=		pathfix pkgconfig tar:bzip2
+USES=		libtool pathfix pkgconfig tar:bzip2
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	openssl_CFLAGS="-I${OPENSSLINC}" \
 		openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == "no"
 

comms/libimobiledevice/pkg-plist

@@ -30,9 +30,9 @@ include/libimobiledevice/sbservices.h
 include/libimobiledevice/screenshotr.h
 include/libimobiledevice/webinspector.h
 lib/libimobiledevice.a
-lib/libimobiledevice.la
 lib/libimobiledevice.so
 lib/libimobiledevice.so.4
+lib/libimobiledevice.so.4.0.1
 libdata/pkgconfig/libimobiledevice-1.0.pc
 man/man1/idevice_id.1.gz
 man/man1/idevicebackup.1.gz

comms/py-libimobiledevice/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -21,11 +21,12 @@ BUILD_WRKSRC=	${WRKSRC}/cython
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.a \
-		${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.la \
 		${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.so
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,../src/libimobiledevice.la,${LOCALBASE}/lib/libimobiledevice.la,' \
+	@${REINPLACE_CMD} \
+		-e 's,../src/libimobiledevice.la,-limobiledevice,' \
+		-e 's/$$(imobiledevice_la_DEPENDENCIES)//' \
 		${BUILD_WRKSRC}/Makefile.in
 
 .include "${MASTERDIR}/Makefile"