diff -urN /usr/ports/emulators/hugo/Makefile emulators/hugo/Makefile
--- /usr/ports/emulators/hugo/Makefile	2013-12-18 23:44:37.000000000 +0900
+++ emulators/hugo/Makefile	2013-12-31 00:00:00.000000000 +0900
@@ -5,52 +5,58 @@
 PORTVERSION=	2.12
 PORTREVISION=	12
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.zeograd.com/download/
+MASTER_SITES=	http://www.zeograd.com/download/ \
+		http://www.sourcefiles.org/Emulators/Videogames/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A PC Engine (TurboGrafx 16) emulator
+COMMENT=	PC Engine (TurboGrafx 16) emulator
 
-BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
+LICENSE=	BSD GPLv2
+LICENSE_COMB=	multi
+
+LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone
+
+OPTIONS_DEFINE=	GTK2 DOCS NETPLAY SDL_MIXER
+OPTIONS_DEFAULT=GTK2
+OPTIONS_SUB=	yes
+NETPLAY_DESC=	Netplay support
+SDL_MIXER_DESC=	SDL_mixer support
 
-GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
 USE_SDL=	sdl
+USE_CSTD=	gnu89
+GNU_CONFIGURE=	yes
+
+CFLAGS+=	-Wno-return-type
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	SDL_CONFIG="${SDL_CONFIG}"
 
-.if !defined(WITHOUT_NETPLAY)
-USE_SDL+=	net
-.else
-CONFIGURE_ARGS+=	--enable-netplay=no
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MGTK2) && ${PORT_OPTIONS:MNETPLAY}
+IGNORE=	NETPLAY support requires GTK2 support
 .endif
 
-.if defined(WITHOUT_GUI)
-CONFIGURE_ARGS+=	--enable-gui=no --disable-gtktest
-.else
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
+.else
+CONFIGURE_ARGS+=	--disable-gui --disable-gtktest
 .endif
 
-.if defined(WITH_OGG_SUPPORT)
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-WITH_SDL_MIXER=	yes
-CONFIGURE_ARGS+=	--with-ogg-support
+.if ${PORT_OPTIONS:MNETPLAY}
+USE_SDL+=	net
+.else
+CONFIGURE_ENV+=	ac_cv_lib_SDL_net_main=no
 .endif
 
-.if defined(WITH_SDL_MIXER)
+.if ${PORT_OPTIONS:MSDL_MIXER}
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 USE_SDL+=	mixer
-CONFIGURE_ARGS+=	--with-sdl-mixer
-.endif
-
-MAKE_ENV+=	DOCSDIR="${DOCSDIR}"
-
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	PORTDOCS=false
+CFLAGS+=	-DOGG_SUPPORT
 .else
-MAKE_ENV+=	PORTDOCS=true
+CONFIGURE_ENV+=	ac_cv_lib_SDL_mixer_main=no \
+		ac_cv_lib_vorbis_main=no \
+		ac_cv_lib_vorbisfile_main=no
 .endif
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff -urN /usr/ports/emulators/hugo/files/patch-Makefile.in emulators/hugo/files/patch-Makefile.in
--- /usr/ports/emulators/hugo/files/patch-Makefile.in	2013-11-06 22:06:15.000000000 +0900
+++ emulators/hugo/files/patch-Makefile.in	2013-12-31 00:00:00.000000000 +0900
@@ -16,12 +16,12 @@
 -	if test -d $(srcdir)/doc; then \
 -	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
 -	  for doc in $(srcdir)/doc/*.{html,txt,css}; do \
-+	if test -d $(srcdir)/doc && ${PORTDOCS}; then \
-+	  $(mkinstalldirs) ${DOCSDIR}; \
++	if test -d $(srcdir)/doc; then \
++	  $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/hugo; \
 +	  for doc in $(srcdir)/doc/*.html $(srcdir)/doc/*.txt $(srcdir)/doc/*.css; do \
  	    if test -f $$doc; then \
 -	      $(INSTALL_DATA) $$doc $(DESTDIR)$(pkgdatadir)/doc; \
-+	      $(INSTALL_DATA) $$doc ${DOCSDIR}; \
++	      $(INSTALL_DATA) $$doc $(DESTDIR)$(datadir)/doc/hugo; \
  	    fi \
  	  done \
  	fi
diff -urN /usr/ports/emulators/hugo/files/patch-configure emulators/hugo/files/patch-configure
--- /usr/ports/emulators/hugo/files/patch-configure	2013-11-06 22:06:15.000000000 +0900
+++ emulators/hugo/files/patch-configure	2013-12-31 00:00:00.000000000 +0900
@@ -27,7 +27,7 @@
  then
  
  
-@@ -8657,7 +8659,7 @@
+@@ -8657,13 +8657,13 @@
  
  		 fi
  	 ;;
@@ -36,7 +36,15 @@
  	  echo "FreeBSD build enabled"
  
  		 	 HUGO_TARGET_MACHINE="FREEBSD"
-@@ -8675,6 +8677,35 @@
+ 
+- 			 CFLAGS="$CFLAGS `sdl-config --cflags`"
+-       LIBS="$LIBS `sdl-config --libs`"
++ 			 CFLAGS="$CFLAGS `${SDL_CONFIG} --cflags`"
++       LIBS="$LIBS `${SDL_CONFIG} --libs`"
+ 
+ 
+ 
+@@ -8675,6 +8675,35 @@
    SDL_FREEBSD_FALSE=
  fi
  
diff -urN /usr/ports/emulators/hugo/pkg-plist emulators/hugo/pkg-plist
--- /usr/ports/emulators/hugo/pkg-plist	2013-11-06 22:06:14.000000000 +0900
+++ emulators/hugo/pkg-plist	2013-12-31 00:00:00.000000000 +0900
@@ -1,5 +1,5 @@
 bin/hugo
-bin/hugod
+%%NETPLAY%%bin/hugod
 %%PORTDOCS%%%%DOCSDIR%%/README.old.txt
 %%PORTDOCS%%%%DOCSDIR%%/cdrom.html
 %%PORTDOCS%%%%DOCSDIR%%/cdrom.txt