Implement WANT_GNOME.

6 files changed, 122 insertions, 113 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 58713e318fa6..44ffa288fda9 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -17,24 +17,22 @@ MAINTAINER=	cjh@kr.freebsd.org
 
 LIB_DEPENDS=    gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_X_PREFIX=	YES
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+WANT_GNOME=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-hangul-keyboard=2
-MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
-# gnome panel applet support
-.if defined(WITH_GNOME_APPLET)
-PKGNAMESUFFIX=	-gnome
-RUN_DEPENDS+=	panel:${PORTSDIR}/x11/gnomecore
-CONFIGURE_ARGS+= --enable-gnome-applet
+.include <bsd.port.pre.mk>
+
+# gnome support
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome-applet
+DATADIR=	share/gnome
 .else
-pre-fetch:
-	@${ECHO_MSG} "Type \"make WITH_GNOME_APPLET=YES\" if you want GNOME panel applet support."
+DATADIR=	share
 .endif
 
 post-build:
@@ -43,7 +41,6 @@ post-build:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin
-
 	# patch XLC_LOCALE for ko_KR.EUC(harmless)
 	if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE; then \
 	${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
@@ -51,19 +48,15 @@ post-install:
 	fi
 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
 		${PREFIX}/lib/X11/locale/ko/
-
 	${MKDIR} ${PREFIX}/share/doc/ami
 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
 		${PREFIX}/share/doc/ami
-
 .for NAME in AUTHORS README NEWS ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${NAME} \
 		${PREFIX}/share/doc/ami
 .endfor
+	${GUNZIP_CMD} -cd ${DISTDIR}/hanja.dic.gz > \
+			${PREFIX}/${DATADIR}/ami/hanja.dic
+	${CAT} ${DISTDIR}/ami.dic >> ${PREFIX}/${DATADIR}/ami/hanja.dic
 
-	# dic
-	${GUNZIP_CMD} -cd ${_DISTDIR}/hanja.dic.gz > \
-			${PREFIX}/share/ami/hanja.dic
-	${CAT} ${_DISTDIR}/ami.dic >> ${PREFIX}/share/ami/hanja.dic
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 3380da644829..1079c421b0dc 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -1,43 +1,45 @@
 bin/ami
-@exec ln -fs ami %B/wmami
-@unexec rm -f %B/wmami
+%%GNOME:%%bin/ami_applet
 bin/hanja-hwp2ami
-share/ami/gtkrc
-share/ami/hanja.dic
-share/ami/pix/nam/ami-e.xpm
-share/ami/pix/nam/ami-h.xpm
-share/ami/pix/nam/AUTHORS
-share/ami/pix/nam/ami-d.xpm
-@dirrm share/ami/pix/nam
-share/ami/pix/arctic/ami-d.xpm
-share/ami/pix/arctic/ami-e.xpm
-share/ami/pix/arctic/ami-h.xpm
-share/ami/pix/arctic/AUTHORS
-@dirrm share/ami/pix/arctic
-share/ami/pix/OSX/ami-d.xpm
-share/ami/pix/OSX/ami-e.xpm
-share/ami/pix/OSX/ami-h.xpm
-share/ami/pix/OSX/AUTHORS
-@dirrm share/ami/pix/OSX
-share/ami/pix/Mac/ami-d.xpm
-share/ami/pix/Mac/ami-e.xpm
-share/ami/pix/Mac/ami-h.xpm
-share/ami/pix/Mac/AUTHORS
-@dirrm share/ami/pix/Mac
-share/ami/pix/Aqua/ami-d.xpm
-share/ami/pix/Aqua/ami-e.xpm
-share/ami/pix/Aqua/ami-h.xpm
-share/ami/pix/Aqua/AUTHORS
-@dirrm share/ami/pix/Aqua
-@dirrm share/ami/pix
-@dirrm share/ami
+bin/wmami
+%%GNOME:%%etc/CORBA/servers/ami.gnorba
+share/doc/ami/AUTHORS
+share/doc/ami/ChangeLog
+share/doc/ami/NEWS
+share/doc/ami/README
 share/doc/ami/XLC_LOCALE
+%%DATADIR%%/ami/gtkrc
+%%DATADIR%%/ami/hanja.dic
+%%DATADIR%%/ami/pix/Aqua/AUTHORS
+%%DATADIR%%/ami/pix/Aqua/ami-d.xpm
+%%DATADIR%%/ami/pix/Aqua/ami-e.xpm
+%%DATADIR%%/ami/pix/Aqua/ami-h.xpm
+%%DATADIR%%/ami/pix/Mac/AUTHORS
+%%DATADIR%%/ami/pix/Mac/ami-d.xpm
+%%DATADIR%%/ami/pix/Mac/ami-e.xpm
+%%DATADIR%%/ami/pix/Mac/ami-h.xpm
+%%DATADIR%%/ami/pix/OSX/AUTHORS
+%%DATADIR%%/ami/pix/OSX/ami-d.xpm
+%%DATADIR%%/ami/pix/OSX/ami-e.xpm
+%%DATADIR%%/ami/pix/OSX/ami-h.xpm
+%%DATADIR%%/ami/pix/arctic/AUTHORS
+%%DATADIR%%/ami/pix/arctic/ami-d.xpm
+%%DATADIR%%/ami/pix/arctic/ami-e.xpm
+%%DATADIR%%/ami/pix/arctic/ami-h.xpm
+%%DATADIR%%/ami/pix/nam/AUTHORS
+%%DATADIR%%/ami/pix/nam/ami-d.xpm
+%%DATADIR%%/ami/pix/nam/ami-e.xpm
+%%DATADIR%%/ami/pix/nam/ami-h.xpm
+%%GNOME:%%share/gnome/applets/Utility/ami.desktop
 @comment copy new locale definition(no harm, so need not be uninstalled)
-@exec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE %D/lib/X11/locale/ko/XLC_LOCALE.orig; fi
 @exec cp %D/share/doc/ami/XLC_LOCALE %D/lib/X11/locale/ko/
+@exec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE %D/lib/X11/locale/ko/XLC_LOCALE.orig; fi
 @unexec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE.orig ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE.orig %D/lib/X11/locale/ko/XLC_LOCALE; fi
-share/doc/ami/AUTHORS
-share/doc/ami/README
-share/doc/ami/NEWS
-share/doc/ami/ChangeLog
 @dirrm share/doc/ami
+@dirrm %%DATADIR%%/ami/pix/nam
+@dirrm %%DATADIR%%/ami/pix/arctic
+@dirrm %%DATADIR%%/ami/pix/OSX
+@dirrm %%DATADIR%%/ami/pix/Mac
+@dirrm %%DATADIR%%/ami/pix/Aqua
+@dirrm %%DATADIR%%/ami/pix
+@dirrm %%DATADIR%%/ami
diff --git a/korean/bitchx/Makefile b/korean/bitchx/Makefile
index 57b6a3411e5b..1621a5c95a8b 100644
--- a/korean/bitchx/Makefile
+++ b/korean/bitchx/Makefile
@@ -19,36 +19,31 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hollywar@mail.holywar.net
 
-.if defined(WITH_GNOME)
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-#PATCH_DIST_ARGS=       -d ${WRKDIR}/ --forward --quiet -E ${PATCH_DIST_STRIP}
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 WRKSRC=         ${WRKDIR}/BitchX
+
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=	--with-plugins --with-gtk --enable-sound
-.else
-CONFIGURE_ARGS+=	--with-plugins --without-gtk
-.endif
-CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}/share"	\
-			--bindir="${PREFIX}/bin" \
-			--datadir="${PREFIX}/share" \
-			--libdir="${PREFIX}/share"
-
+WANT_ESOUND=	yes
+WANT_GNOME=	yes
+CONFIGURE_ARGS=	--with-plugins \
+		--exec-prefix="${PREFIX}/share"	\
+		--bindir="${PREFIX}/bin" \
+		--datadir="${PREFIX}/share" \
+		--libdir="${PREFIX}/share"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}"
+		LIBS="-L{LOCALBASE}/lib"
 
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+.include <bsd.port.pre.mk>
 
-.if !defined(WITH_GNOME)
-pre-extract:
-	@${ECHO} "You can add hooks for GNOME by defining WITH_GNOME"
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--with-gtk
+.else
+CONFIGURE_ARGS+=--without-gtk
+.endif
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+CONFIGURE_ARGS+=--enable-sound
 .endif
 
 post-install:
@@ -61,21 +56,5 @@ post-install:
 	${RMDIR} ${PREFIX}/share/bx/help/4_Misc/fset
 	${RMDIR} ${PREFIX}/share/bx/help/4_Misc/wset
 .endif
-.if defined(WITH_GNOME)
-	@${ECHO} bin/gtkBitchX >> ${TMPPLIST}
-	@${ECHO} bin/gtkBitchX-1.0c16+H1 >> ${TMPPLIST}
-	@${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST}
-.else
-	@${ECHO} bin/bx >> ${TMPPLIST}
-	@${ECHO} bin/BitchX >> ${TMPPLIST}
-	@${ECHO} bin/BitchX-1.0c16+H1 >> ${TMPPLIST}
-	@${ECHO} bin/scr-bx >> ${TMPPLIST}
-	@${ECHO} share/bx/wserv >> ${TMPPLIST}
-.endif
-	@${ECHO} @dirrm share/bx/help >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx/plugins >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx/script >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx/translation >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/bitchx/files/patch-ag b/korean/bitchx/files/patch-ag
new file mode 100644
index 000000000000..163bf1445c7c
--- /dev/null
+++ b/korean/bitchx/files/patch-ag
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Jan  9 02:11:01 2000
++++ Makefile.in	Sat Sep  9 01:24:46 2000
+@@ -43,7 +43,7 @@
+ IRCLIB = @IRCLIB@
+ 
+ CC = @CC@
+-DEFS = -I$$(srcdir)/../include -I$(topdir)/include
++DEFS = -I$$(srcdir)/../include -I$(topdir)/include -I. -I-
+ LIBS = @LIBS@
+ INCLUDES = @INCLUDES@
+ 
diff --git a/korean/bitchx/files/patch-ah b/korean/bitchx/files/patch-ah
new file mode 100644
index 000000000000..fca11c214367
--- /dev/null
+++ b/korean/bitchx/files/patch-ah
@@ -0,0 +1,11 @@
+--- dll/Makefile.in.orig	Sun Oct  1 22:05:20 2000
++++ dll/Makefile.in	Sun Oct  1 22:05:47 2000
+@@ -31,7 +32,7 @@
+ 	'SHLIB_CFLAGS=$(SHLIB_CFLAGS)'		\
+ 	'IRCLIB=$(IRCLIB)'			\
+         'TCLINC=$(TCLINC)'			\
+-	'INCLUDES=$(INCLUDES)'			\
++	'INCLUDES=$(DEFS) $(INCLUDES)'		\
+ 	'DEFS=$(DEFS)'				\
+ 	'local_dir=$(local_dir)'		\
+ 	'LIBS=$(LIBS)'
diff --git a/korean/bitchx/pkg-plist b/korean/bitchx/pkg-plist
index e27a42624e53..1db84aebe59f 100644
--- a/korean/bitchx/pkg-plist
+++ b/korean/bitchx/pkg-plist
@@ -1,3 +1,9 @@
+%%NOGNOME:%%bin/BitchX
+%%NOGNOME:%%bin/BitchX-1.0c16+H1
+%%GNOME:%%bin/gtkBitchX
+%%GNOME:%%bin/gtkBitchX-1.0c16+H1
+bin/bx
+%%NOGNOME:%%bin/scr-bx
 share/bx/BitchX.quit
 share/bx/BitchX.ircnames
 share/bx/BitchX.reasons
@@ -907,6 +913,7 @@ share/bx/plugins/encrypt.so
 share/bx/plugins/fserv.so
 share/bx/plugins/hint.so
 share/bx/plugins/nap.so
+%%GNOME:%%share/bx/plugins/nicklist.so
 share/bx/plugins/pkga.so
 share/bx/plugins/possum.so
 share/bx/plugins/qmail.so
@@ -953,19 +960,25 @@ share/bx/translation/SWEDISH_NAMES_COM
 share/bx/translation/SWISS
 share/bx/translation/UNITED_KINGDOM
 share/bx/translation/UNITED_KINGDOM_COM
+%%NOGNOME:%%share/bx/wserv
 share/doc/bitchx/bxfaq.html
+@dirrm share/doc/bitchx
+@dirrm share/bx/translation
+@dirrm share/bx/script
+@dirrm share/bx/plugins
+@dirrm share/bx/help/8_Scripts
+@dirrm share/bx/help/7_Docs
+@dirrm share/bx/help/6_Functions
+@dirrm share/bx/help/5_Programming/on
+@dirrm share/bx/help/5_Programming
+@dirrm share/bx/help/4_Misc/window
+@dirrm share/bx/help/4_Misc/set
+@dirrm share/bx/help/4_Misc/bind
+@dirrm share/bx/help/4_Misc
+@dirrm share/bx/help/3_Operators
+@dirrm share/bx/help/2_Queries
 @dirrm share/bx/help/1_General/dcc
 @dirrm share/bx/help/1_General/ctcp
 @dirrm share/bx/help/1_General
-@dirrm share/bx/help/2_Queries
-@dirrm share/bx/help/3_Operators
-@dirrm share/bx/help/4_Misc/bind
-@dirrm share/bx/help/4_Misc/set
-@dirrm share/bx/help/4_Misc/window
-@dirrm share/bx/help/4_Misc
-@dirrm share/bx/help/5_Programming/on
-@dirrm share/bx/help/5_Programming
-@dirrm share/bx/help/6_Functions
-@dirrm share/bx/help/7_Docs
-@dirrm share/bx/help/8_Scripts
-@dirrm share/doc/bitchx
+@dirrm share/bx/help
+@dirrm share/bx