- Enable GTK2 support by default (GTK1 support is still available)

- Support PLIST_FILES

PR:		143819
Submitted by:	Ports Fury

x11/xvattr/Makefile

@@ -8,18 +8,45 @@
 
 PORTNAME=	xvattr
 PORTVERSION=	1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Getting and setting Xv attributes
 
-USE_PERL5_BUILD=	yes
-USE_GNOME=		gtk12
+OPTIONS=	GTK1 "GTK1 support (Default is GTK2)" off
+
 USE_XORG=	x11 xv
-GNU_CONFIGURE=		yes
+WANT_GNOME=	yes
 
-MAN1=		xvattr.1
+MAN1=		${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME} bin/g${PORTNAME}
 
-.include <bsd.port.mk>
+CFLAGS+=	-DVERSION=\"${PORTVERSION}\"
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GTK1)
+USE_GNOME+=	gtk12
+GTK_PC=		gtk+
+.else
+USE_GNOME+=	gtk20
+GTK_PC=		gtk+-2.0
+.endif
+
+post-extract:
+	@${RM} -f ${WRKSRC}/getopt.h
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${PORTNAME}.c -o ${PORTNAME} \
+		`pkg-config --cflags --libs xv`
+	cd ${WRKSRC} && ${CC} ${CFLAGS} g${PORTNAME}.c -o g${PORTNAME} \
+		`pkg-config --cflags --libs ${GTK_PC} xv`
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/g${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+
+.include <bsd.port.post.mk>

x11/xvattr/pkg-plist

@@ -1,2 +0,0 @@
-bin/gxvattr
-bin/xvattr