svn commit: r307116 - head/textproc/libexttextcat

[Baptiste Daroussin]

Author: bapt
Date: Wed Nov  7 07:47:56 2012
New Revision: 307116
URL: http://svnweb.freebsd.org/changeset/ports/307116

Log:
  Now that libexttextcat can happily live along with libtextcat remove the
  artificial compatibility mode.
  
  The default package hasn't change so no bump
  
  Feature safe:	yes

Modified:
  head/textproc/libexttextcat/Makefile
  head/textproc/libexttextcat/pkg-plist

Modified: head/textproc/libexttextcat/Makefile
==============================================================================
--- head/textproc/libexttextcat/Makefile	Wed Nov  7 06:24:50 2012	(r307115)
+++ head/textproc/libexttextcat/Makefile	Wed Nov  7 07:47:56 2012	(r307116)
@@ -19,32 +19,15 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	README README.libtextcat TODO
 
-OPTIONS_DEFINE=	COMPAT_TEXTCAT DOCS
+OPTIONS_DEFINE=	DOCS
 COMPAT_TEXTCAT_DESC=	Install libtextcat compatible files
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCOMPAT_TEXTCAT}
-.if exists(${PREFIX}/lib/libtextcat.a)
-CONFLICTS_INSTALL=	libtextcat*
-.endif
-PLIST_SUB+=	TEXTCAT=''
-PLIST_SUB+=	EXEEXT=''
-.else
-PLIST_SUB+=	TEXTCAT='@comment '
 PLIST_SUB+=	EXEEXT='x'
 MAKE_ARGS=	EXEEXT=x
-.endif
 
 post-install:
-.if ${PORT_OPTIONS:MCOMPAT_TEXTCAT}
-	${LN} -sf libexttextcat/textcat.h ${PREFIX}/include/
-	${LN} -sf libexttextcat ${PREFIX}/include/libtextcat
-	${LN} -sf libexttextcat-1.0.a ${PREFIX}/lib/libtextcat.a
-	${LN} -sf libexttextcat-1.0.la ${PREFIX}/lib/libtextcat.la
-	${LN} -sf libexttextcat-1.0.so.0 ${PREFIX}/lib/libtextcat.so
-	${LN} -sf libexttextcat-1.0.so.0 ${PREFIX}/lib/libtextcat.so.0
-.endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}

Modified: head/textproc/libexttextcat/pkg-plist
==============================================================================
--- head/textproc/libexttextcat/pkg-plist	Wed Nov  7 06:24:50 2012	(r307115)
+++ head/textproc/libexttextcat/pkg-plist	Wed Nov  7 07:47:56 2012	(r307116)
@@ -1,4 +1,4 @@
-bin/createfp%%EXEEXT%%
+bin/createfpx
 include/libexttextcat/common.h
 include/libexttextcat/constants.h
 include/libexttextcat/exttextcat-version.h
@@ -6,16 +6,10 @@ include/libexttextcat/fingerprint.h
 include/libexttextcat/textcat.h
 include/libexttextcat/textcat_properties.h
 include/libexttextcat/utf8misc.h
-%%TEXTCAT%%include/textcat.h
-%%TEXTCAT%%include/libtextcat
 lib/libexttextcat-1.0.a
 lib/libexttextcat-1.0.la
 lib/libexttextcat-1.0.so
 lib/libexttextcat-1.0.so.0
-%%TEXTCAT%%lib/libtextcat.a
-%%TEXTCAT%%lib/libtextcat.la
-%%TEXTCAT%%lib/libtextcat.so
-%%TEXTCAT%%lib/libtextcat.so.0
 libdata/pkgconfig/libexttextcat.pc
 share/vala/vapi/libexttextcat.vapi
 %%DATADIR%%/ab.lm