3 files changed, 58 insertions, 20 deletions

diff --git a/x11/xorg-edit/Makefile b/x11/xorg-edit/Makefile
index c471a7ef1302..145112c6238f 100644
--- a/x11/xorg-edit/Makefile
+++ b/x11/xorg-edit/Makefile
@@ -1,36 +1,72 @@
-# New ports collection makefile for:	xorg-edit
-# Date created:		4 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-edit
-PORTVERSION=	07.08.11
-PORTREVISION=	5
+PORTVERSION=	08.08.06
 CATEGORIES=	x11
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
+DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI to edit xorg.conf
 
-USE_WX=		2.6
+LICENSE=	GPLv3
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_BZIP2=	yes
+USE_DOS2UNIX=	*.cpp *.h
+USE_WX=		2.6+
 WX_UNICODE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-#BUILD_WRKSRC=	${WRKSRC}/sources
-PLIST_FILES=	bin/${PORTNAME}
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+PLIST_FILES=	bin/xorg-edit \
+		lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \
+		lib/xorg-edit/options/devices/example.xml \
+		lib/xorg-edit/options/devices/list.xml \
+		lib/xorg-edit/options/devices/nvidia.xml \
+		lib/xorg-edit/xorg-edit
+PLIST_DIRS=	lib/xorg-edit/options/devices \
+		lib/xorg-edit/options \
+		lib/xorg-edit/de_DE/LC_MESSAGES \
+		lib/xorg-edit/de_DE \
+		lib/xorg-edit
 
-post-extract:
-	@${CHMOD} -R a+rX,u+w ${WRKSRC}
+DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g;s|/usr/local|$${PREFIX}|g'\
-		${BUILD_WRKSRC}/xorgedit/${MAKEFILE}
-	@${REINPLACE_CMD} -e '/^CXX.*=/d' ${BUILD_WRKSRC}/libxorgedit/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^CXX =|CXX ?=| ; \
+		 s|^CXXFLAGS =|CXXFLAGS ?=|' ${WRKSRC}/libxorgedit/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^CXXFLAGS =|CXXFLAGS +=| ; \
+		 s|wx-config|$$(WX_CONFIG)| ; \
+		 s|-O3|| ; \
+		 s|^CXX =|CXX ?=| ; \
+		 s|^LDFLAGS =|LDFLAGS +=| ; \
+		 s|^$$(OBJECTS).*|%.o: %.c|' ${WRKSRC}/xorgedit/Makefile
+
+do-configure:
+	@${ECHO_CMD} -n > ${WRKDIR}/xorg-edit
+	@${ECHO_CMD} '#!/bin/sh' >> ${WRKDIR}/xorg-edit
+	@${ECHO_CMD} 'cd ${PREFIX}/lib/xorg-edit && ./xorg-edit "$$@"' \
+		>> ${WRKDIR}/xorg-edit
+	@${ECHO_CMD} -n > ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'all:' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} '	$$(MAKE) -C libxorgedit' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} '	$$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	(cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${PREFIX}/bin)
+	@${MKDIR} ${PREFIX}/lib/xorg-edit
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \
+		${PREFIX}/lib/xorg-edit)
+	@${MKDIR} ${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES
+	(cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \
+		${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES)
+	@${MKDIR} ${PREFIX}/lib/xorg-edit/options/devices
+	(cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \
+		${PREFIX}/lib/xorg-edit/options/devices)
 
 .include <bsd.port.mk>
diff --git a/x11/xorg-edit/distinfo b/x11/xorg-edit/distinfo
index 4fc052796675..cc8ed6063d00 100644
--- a/x11/xorg-edit/distinfo
+++ b/x11/xorg-edit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg-edit_07.08.11_src.tar.bz2) = 96d0001b47bc0ff7e15f65e83714675206a3834ec8016615b1137d2c200fa1b1
-SIZE (xorg-edit_07.08.11_src.tar.bz2) = 100616
+SHA256 (xorg-edit-08.08.06_src.tar.bz2) = 93b189c276df9bae9d9bfbb4212a068aad53b524af6615d1dad7003ee5857967
+SIZE (xorg-edit-08.08.06_src.tar.bz2) = 101654
diff --git a/x11/xorg-edit/pkg-descr b/x11/xorg-edit/pkg-descr
index b78643af51bd..f15a3a1bcf03 100644
--- a/x11/xorg-edit/pkg-descr
+++ b/x11/xorg-edit/pkg-descr
@@ -1 +1,3 @@
 GUI to edit XServer-file xorg.conf easily
+
+WWW: http://www.deesaster.org/progxorg.php