2 files changed, 27 insertions, 33 deletions

diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 1c2c022fc977..3adedfe3b49a 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -7,32 +7,26 @@ CATEGORIES=	databases
 MASTER_SITES=	SF/iodbc/iodbc/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	An ODBC 3.x driver manager, for universal data source access
+COMMENT=	ODBC 3.x driver manager, for universal data source access
 
-LICENSE=		BSD LGPL20
+LICENSE=		BSD3CLAUSE LGPL20
 LICENSE_COMB=		dual
 LICENSE_FILE_BSD=	${WRKSRC}/LICENSE.BSD
 LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE.LGPL
 
 CONFLICTS=	unixODBC-[0-9]*
 
-USES=		pathfix pkgconfig
-USE_AUTOTOOLS=	libtool
+USES=		libtool:oldver pathfix pkgconfig
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-iodbc-inidir=${ETCDIR}
 USE_LDCONFIG=	yes
 
-MAN1=		iodbc-config.1 iodbctest.1 iodbctestw.1
+OPTIONS_DEFINE=	GTK2 DOCS EXAMPLES
+OPTIONS_SUB=	yes
 
-.if defined(WITH_GUI)
-USE_GNOME+=	gtk20
-MAN1+=		iodbcadm-gtk.1
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=	--disable-gui
-PLIST_SUB+=	GUI="@comment "
-.endif
+GTK2_USE=	GNOME=gtk20
+GTK2_CONFIGURE_ENABLE=	gui
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|samples||' ${WRKSRC}/Makefile.in
@@ -40,19 +34,15 @@ post-patch:
 		's|-ldl||g' ${WRKSRC}/admin/libiodbc.pc.in
 
 post-install:
-	@${MKDIR} ${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${ETCDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${STAGEDIR}/${ETCDIR}
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for f in AUTHORS ChangeLog NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for f in Makefile.sample iodbctest.c
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}/${EXAMPLESDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist
index 230b52d1e64a..f42a202364dc 100644
--- a/databases/libiodbc/pkg-plist
+++ b/databases/libiodbc/pkg-plist
@@ -1,5 +1,5 @@
 bin/iodbc-config
-%%GUI%%bin/iodbcadm-gtk
+%%GTK2%%bin/iodbcadm-gtk
 %%ETCDIR%%/odbc.ini.sample
 %%ETCDIR%%/odbcinst.ini.sample
 include/iodbcext.h
@@ -13,18 +13,18 @@ include/sql.h
 include/sqlext.h
 include/sqltypes.h
 include/sqlucode.h
-%%GUI%%lib/libdrvproxy.a
-%%GUI%%lib/libdrvproxy.la
-%%GUI%%lib/libdrvproxy.so
-%%GUI%%lib/libdrvproxy.so.3
+%%GTK2%%lib/libdrvproxy.a
+%%GTK2%%lib/libdrvproxy.la
+%%GTK2%%lib/libdrvproxy.so
+%%GTK2%%lib/libdrvproxy.so.3
 lib/libiodbc.a
 lib/libiodbc.la
 lib/libiodbc.so
 lib/libiodbc.so.3
-%%GUI%%lib/libiodbcadm.a
-%%GUI%%lib/libiodbcadm.la
-%%GUI%%lib/libiodbcadm.so
-%%GUI%%lib/libiodbcadm.so.3
+%%GTK2%%lib/libiodbcadm.a
+%%GTK2%%lib/libiodbcadm.la
+%%GTK2%%lib/libiodbcadm.so
+%%GTK2%%lib/libiodbcadm.so.3
 lib/libiodbcinst.a
 lib/libiodbcinst.la
 lib/libiodbcinst.so
@@ -32,6 +32,10 @@ lib/libiodbcinst.so.3
 lib/libodbc.a
 lib/libodbc.so
 libdata/pkgconfig/libiodbc.pc
+man/man1/iodbc-config.1.gz
+%%GTK2%%man/man1/iodbcadm-gtk.1.gz
+man/man1/iodbctest.1.gz
+man/man1/iodbctestw.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS