Bug 99163 - [PATCH] polish/gadugadu OPTIONS fix
Summary: [PATCH] polish/gadugadu OPTIONS fix
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ion-Mihai "IOnut" Tetcu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-06-19 06:40 UTC by Arseny Nasokin
Modified: 2006-07-12 22:59 UTC (History)
0 users

See Also:


Attachments
file.diff (1.70 KB, patch)
2006-06-19 06:40 UTC, Arseny Nasokin
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Arseny Nasokin 2006-06-19 06:40:15 UTC

    
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-06-19 07:47:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->itetcu

itetcu@ wants to have OPTIONS PRs
Comment 2 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-06-20 10:46:47 UTC
State Changed
From-To: open->feedback

fails to patch, this might help you: 
http://www.freebsd.org/cgi/getmsg.cgi?fetch=997415+0+/usr/local/www/db/text/2006/freebsd-ports/20060521.freebsd-ports
Comment 3 mwisnicki+freebsd 2006-07-03 18:28:54 UTC
Submitted patch has spaces instead of tabs, I'm attaching corrected
version. It compiles and runs fine with default config, but I cannot
test anything else.

If you want you can commit this or just set DEPRECATED unless someone
wants to maintain it. This is some old and no longer maintained
gtk1/gnome1 app. Users of this software can always install
polish/gnugadu2.

--- pl-gnugadu-1.0.0_2.patch begins here ---
diff
-ruN /usr/ports/polish/gnugadu.orig/Makefile /usr/ports/polish/gnugadu/Makefile
--- /usr/ports/polish/gnugadu.orig/Makefile	Tue May 16 21:21:20 2006
+++ /usr/ports/polish/gnugadu/Makefile	Mon Jul  3 19:04:01 2006
@@ -16,26 +16,40 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GaduGadu client for X11/GTK
 
-BROKEN=		Needs to be converted to OPTIONS
-
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
 .endif
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		CAT="${CAT}" \
-		GNUGADU_OPTIONS="${GNUGADU_OPTIONS}" \
-		REALCURDIR="${.CURDIR}"
+OPTIONS=	ESD "Esound support" on \
+		ARTS "Arts support" off \
+		GNOME "Gnome support" off \
+		PANEL "Gnome applet support" off
+
+.include <bsd.port.pre.mk>
+.if defined(WITH_ESD) && !defined (WITHOUT_ESD)
+USE_GNOME+=	esound
+CONFIGURE_ARGS+=	--enable-esd
+.else
+CONFIGURE_ARGS+=	--disable-esd
+.endif
 
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.gg
+.if defined(WITH_GNOME) && !defined (WITHOUT_GNOME)
+USE_GNOME+=	gnomelibs 
+CONFIGURE_ARGS+=	--enable-gnome
+.else
+CONFIGURE_ARGS+=	--disable-esd
+.endif
+
+.if defined(WITH_PANEL) && !defined (WITHOUT_PANEL)
+USE_GNOME+=	gnomepanel
+CONFIGURE_ARGS+=	--enable-panel
+.else
+CONFIGURE_ARGS+=	--disable-panel
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,GTK_ CFLAGS,GTK_CFLAGS,' \
@@ -52,8 +66,4 @@
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- pl-gnugadu-1.0.0_2.patch ends here ---
Comment 4 mwisnicki+freebsd 2006-07-03 18:32:50 UTC
Dnia 03-07-2006, pon o godzinie 19:29 +0200, Marcin Wisnicki napisaÅ(a):
> Submitted patch has spaces instead of tabs, I'm attaching corrected
> version. It compiles and runs fine with default config, but I cannot
> test anything else.
> 
> If you want you can commit this or just set DEPRECATED unless someone
> wants to maintain it. This is some old and no longer maintained
> gtk1/gnome1 app. Users of this software can always install
> polish/gnugadu2.
> 
> --- pl-gnugadu-1.0.0_2.patch begins here ---
> --- pl-gnugadu-1.0.0_2.patch ends here ---

Also, if you are going to commit this then please remove gnugadu/scripts
Comment 5 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-07-12 22:59:54 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!