2 files changed, 29 insertions, 38 deletions

diff --git a/databases/sqlite-ext-mobigroup/Makefile b/databases/sqlite-ext-mobigroup/Makefile
index a15f6928fef7..933bcc2ff445 100644
--- a/databases/sqlite-ext-mobigroup/Makefile
+++ b/databases/sqlite-ext-mobigroup/Makefile
@@ -6,42 +6,33 @@
 #
 
 PORTNAME=	sqlite-ext-mobigroup
-PORTVERSION=	1
-DISTVERSIONPREFIX=	mobigroup.
+PORTVERSION=	3.7.5.1
+PORTEPOCH=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://mobigroup.ru/debian/pool-squeeze/main/s/sqlite3/ \
-		LOCAL/glarkin
-PKGNAMESUFFIX=	-${SQLITE_VERSION}
-DISTNAME=	${SQLITE_NAME}_${SQLITE_VERSION}-${DISTVERSIONPREFIX}${DISTVERSION}
+MASTER_SITES=	http://mobigroup.ru/debian/pool-squeeze/main/s/sqlite3/
+DISTNAME=	sqlite3_${PORTVERSION:R}-mobigroup.${PORTVERSION:E}
 
 MAINTAINER=	pavelivolkov@googlemail.com
 COMMENT=	A mobigroup functions library for SQLite
 
-# Soon to be expired earlier version of the port
-CONFLICTS=	sqlite-ext-inet-[0-9].*
-
 USE_SQLITE=	yes
 
 DIST_SUBDIR=	sqlite-ext
-NO_WRKSUBDIR=	yes
-
-SQLITE_NAME=	sqlite3
-SQLITE_VERSION=	3.7.2
+WRKSRC=		${WRKDIR}/sqlite3-${PORTVERSION:R}
 
 USE_LDCONFIG=	${PREFIX}/libexec/${DIST_SUBDIR}
 
-OPTIONS=	\
-		COMPRESS "compress content into a blob using libz" off \
-		INET "provide the ipv4 functions in SQL queries" on \
-		MD5 "implements the MD5 message-digest algorithm" off \
+OPTIONS=	COMPRESS "compress content into a blob using libz" off \
 		ENV "implements the getenv" off \
-
-.include <bsd.port.pre.mk>
+		INET "provide the ipv4 functions in SQL queries" on \
+		MD5 "implements the MD5 message-digest algorithm" off
 
 PLIST_DIRS=	libexec/${DIST_SUBDIR}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+.include <bsd.port.options.mk>
+
 .ifdef WITH_COMPRESS
 PLIST_FILES+=	libexec/${DIST_SUBDIR}/libsqlitecompress.so
 .endif
@@ -59,19 +50,19 @@ CFLAGS+=	-I${PREFIX}/include -fPIC -lm -shared
 
 do-build:
 .ifdef WITH_COMPRESS
-	@cd ${WRKSRC}/${SQLITE_NAME}/ext/_compress && \
+	@cd ${WRKSRC}/ext/_compress && \
 		${CC} -lz ${CFLAGS} compress.c -o libsqlitecompress.so
 .endif
 .ifdef WITH_INET
-	@cd ${WRKSRC}/${SQLITE_NAME}/ext/inet && \
+	@cd ${WRKSRC}/ext/inet && \
 		${CC} ${CFLAGS} ipv4-ext.c -o libsqliteipv4.so
 .endif
 .ifdef WITH_ENV
-	@cd ${WRKSRC}/${SQLITE_NAME}/ext/env && \
+	@cd ${WRKSRC}/ext/env && \
 		${CC} ${CFLAGS} env.c -o libsqliteenv.so
 .endif
 .ifdef WITH_MD5
-	@cd ${WRKSRC}/${SQLITE_NAME}/ext/md5 && \
+	@cd ${WRKSRC}/ext/md5 && \
 		${CC} ${CFLAGS} md5.c -o libsqlitemd5.so
 .endif
 
@@ -84,34 +75,34 @@ do-install:
 	@${MKDIR} ${EXAMPLESDIR}
 .endif
 .ifdef WITH_COMPRESS
-	@${INSTALL_PROGRAM} ${WRKSRC}/${SQLITE_NAME}/ext/_compress/libsqlitecompress.so ${PREFIX}/libexec/${DIST_SUBDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/ext/_compress/libsqlitecompress.so ${PREFIX}/libexec/${DIST_SUBDIR}
 .endif
 .ifdef WITH_INET
-	@${INSTALL_PROGRAM} ${WRKSRC}/${SQLITE_NAME}/ext/inet/libsqliteipv4.so ${PREFIX}/libexec/${DIST_SUBDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/ext/inet/libsqliteipv4.so ${PREFIX}/libexec/${DIST_SUBDIR}
 .	ifndef NOPORTDOCS
-		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/${SQLITE_NAME}/ext/inet/ipv4-ext.c > ${WRKSRC}/${SQLITE_NAME}/ext/inet/README-ipv4.txt
-		@${INSTALL_DATA} ${WRKSRC}/${SQLITE_NAME}/ext/inet/README-ipv4.txt ${DOCSDIR}
+		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/inet/ipv4-ext.c > ${WRKSRC}/ext/inet/README-ipv4.txt
+		@${INSTALL_DATA} ${WRKSRC}/ext/inet/README-ipv4.txt ${DOCSDIR}
 .	endif
 .	ifndef NOPORTEXAMPLES
-		@${INSTALL_DATA} ${WRKSRC}/${SQLITE_NAME}/ext/inet/ipv4-ext.sql ${EXAMPLESDIR}
+		@${INSTALL_DATA} ${WRKSRC}/ext/inet/ipv4-ext.sql ${EXAMPLESDIR}
 .	endif
 .endif
 .ifdef WITH_ENV
-	@${INSTALL_PROGRAM} ${WRKSRC}/${SQLITE_NAME}/ext/env/libsqliteenv.so ${PREFIX}/libexec/${DIST_SUBDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/ext/env/libsqliteenv.so ${PREFIX}/libexec/${DIST_SUBDIR}
 .	ifndef NOPORTDOCS
-		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/${SQLITE_NAME}/ext/env/env.c > ${WRKSRC}/${SQLITE_NAME}/ext/env/README-env.txt
-		@${INSTALL_DATA} ${WRKSRC}/${SQLITE_NAME}/ext/env/README-env.txt ${DOCSDIR}
+		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/env/env.c > ${WRKSRC}/ext/env/README-env.txt
+		@${INSTALL_DATA} ${WRKSRC}/ext/env/README-env.txt ${DOCSDIR}
 .	endif
 .endif
 .ifdef WITH_MD5
-	@${INSTALL_PROGRAM} ${WRKSRC}/${SQLITE_NAME}/ext/md5/libsqlitemd5.so ${PREFIX}/libexec/${DIST_SUBDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/ext/md5/libsqlitemd5.so ${PREFIX}/libexec/${DIST_SUBDIR}
 .	ifndef NOPORTDOCS
-		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/${SQLITE_NAME}/ext/md5/md5.c > ${WRKSRC}/${SQLITE_NAME}/ext/md5/README-md5.txt
-		@${INSTALL_DATA} ${WRKSRC}/${SQLITE_NAME}/ext/md5/README-md5.txt ${DOCSDIR}
+		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/md5/md5.c > ${WRKSRC}/ext/md5/README-md5.txt
+		@${INSTALL_DATA} ${WRKSRC}/ext/md5/README-md5.txt ${DOCSDIR}
 .	endif
 .	ifndef NOPORTEXAMPLES
-		@${INSTALL_DATA} ${WRKSRC}/${SQLITE_NAME}/ext/md5/md5.sql ${EXAMPLESDIR}
+		@${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.sql ${EXAMPLESDIR}
 .	endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/sqlite-ext-mobigroup/distinfo b/databases/sqlite-ext-mobigroup/distinfo
index 3575953933d6..e234b4fde873 100644
--- a/databases/sqlite-ext-mobigroup/distinfo
+++ b/databases/sqlite-ext-mobigroup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqlite-ext/sqlite3_3.7.2-mobigroup.1.tar.gz) = f9616819969b00802b42e1d8b8599878a3774df268aebfdd78ed2a3051f1ead6
-SIZE (sqlite-ext/sqlite3_3.7.2-mobigroup.1.tar.gz) = 3923088
+SHA256 (sqlite-ext/sqlite3_3.7.5-mobigroup.1.tar.gz) = 5e1b0d82c9ae8ab255a0cecf6de62d8bb1c257d88648630736d7d42ba84f895e
+SIZE (sqlite-ext/sqlite3_3.7.5-mobigroup.1.tar.gz) = 6745516